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/lexinventoryViewLWC/lexinventoryViewLWC.html | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
index 90057ad..4b07073 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
@@ -267,7 +267,11 @@
sorted-by={sortedBy}
onsort={onHandleSort}
hide-checkbox-column={hidecheckboxcolumn}
+<<<<<<< HEAD
style="word-wrap: break-word; word-break: break-all"
+=======
+ style="word-wrap:break-word; word-break:break-all;"
+>>>>>>> LEXCommunityLiJun
class="wrapped-header-datatable"
>
</c-lex-custom-lightning-datatable>
@@ -279,6 +283,10 @@
onfirst={handleFirst}
onlast={handleLast}
page-size-options={pageSizeOptions}
+<<<<<<< HEAD
+=======
+ default-page-size={pageSize}
+>>>>>>> LEXCommunityLiJun
previous-button-disabled={previousButtonDisabled}
next-button-disabled={nextButtonDisabled}
record-start={recordStart}
@@ -289,4 +297,8 @@
</div>
</div>
</div>
+<<<<<<< HEAD
</template>
+=======
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1