From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
index fd35ca3..a19ba16 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
@@ -8,6 +8,10 @@
<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>
@@ -276,4 +280,8 @@
</div>
</div>
</div>
+<<<<<<< HEAD
</template>
+=======
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1