Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html

@@ -8,10 +8,6 @@
                <div style="padding: 15px">
                    <div lwc:dom="manual" class="resultDiv"></div>
                    <div draggable="false">
<<<<<<< HEAD
=======

>>>>>>> LEXCommunityLiJun
                        <!-- <div class="slds-m-top_small slds-m-bottom_medium"> -->
                        <!-- <lightning-button label="新建出库单" onclick={neworderhead}
                                class="slds-m-left_x-small" disabled></lightning-button>
@@ -280,8 +276,4 @@
            </div>
        </div>
    </div>
<<<<<<< HEAD
</template>
=======
</template>
>>>>>>> LEXCommunityLiJun