From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
index bff6b32..61fa4e7 100644
--- a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
+++ b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
@@ -98,7 +98,12 @@
</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>
@@ -114,7 +119,12 @@
</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>
@@ -130,7 +140,12 @@
</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>
@@ -146,7 +161,12 @@
</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>
@@ -454,4 +474,8 @@
</div>
</div>
</template>
-</template>
\ No newline at end of file
+<<<<<<< HEAD
+</template>
+=======
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1