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/lexConInvoiceView/lexConInvoiceView.html | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
index 8e12258..2754039 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
@@ -1360,7 +1360,6 @@
word-break: break-all;
"
class="wrapped-header-datatable"
- min-column-width="115"
>
</c-lex-custom-lightning-datatable>
<lightning-datatable
@@ -1378,4 +1377,8 @@
</div>
</div>
</template>
-</template>
\ No newline at end of file
+<<<<<<< HEAD
+</template>
+=======
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1