From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
index 61fa4e7..fbf59ea 100644
--- a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
+++ b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
@@ -98,12 +98,8 @@
</div>
</td>
<td style="width: 200px">
-<<<<<<< HEAD
<lightning-formatted-text
style="font-size: 16px"
-=======
- <lightning-formatted-text style="font-size: 16px;"
->>>>>>> LEXCommunityLiJun
value={coc.Name}
></lightning-formatted-text>
</td>
@@ -119,12 +115,8 @@
</div>
</td>
<td style="width: 100px">
-<<<<<<< HEAD
<lightning-formatted-number
style="font-size: 16px"
-=======
- <lightning-formatted-number style="font-size: 16px;"
->>>>>>> LEXCommunityLiJun
value={coc.Total_num__c}
></lightning-formatted-number>
</td>
@@ -140,12 +132,8 @@
</div>
</td>
<td style="width: 100px">
-<<<<<<< HEAD
<lightning-formatted-number
style="font-size: 16px"
-=======
- <lightning-formatted-number style="font-size: 16px;"
->>>>>>> LEXCommunityLiJun
value={coc.OrderNumber_arrived__c}
></lightning-formatted-number>
</td>
@@ -161,12 +149,8 @@
</div>
</td>
<td style="width: 100px">
-<<<<<<< HEAD
<lightning-formatted-number
style="font-size: 16px"
-=======
- <lightning-formatted-number style="font-size: 16px;"
->>>>>>> LEXCommunityLiJun
value={coc.OrderNumber_notarrive__c}
></lightning-formatted-number>
</td>
@@ -474,8 +458,4 @@
</div>
</div>
</template>
-<<<<<<< HEAD
</template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1