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/lexInventory/lexInventory.html | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.html b/force-app/main/default/lwc/lexInventory/lexInventory.html
index 77f620f..c90c293 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.html
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.html
@@ -200,6 +200,7 @@
style="word-wrap: break-word; word-break: break-all"
>
</lightning-datatable>
+<<<<<<< HEAD
<c-paginator
onprevious={handlePrevious}
onnext={handleNext}
@@ -213,6 +214,13 @@
record-end={recordEnd}
total-records={totalRecords}
></c-paginator>
+=======
+ <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
+ onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions} default-page-size={pageSize}
+ previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
+ record-start={recordStart} record-end={recordEnd}
+ total-records={totalRecords}></c-paginator>
+>>>>>>> LEXCommunityLiJun
</div>
<!-- </template> -->
</div>
--
Gitblit v1.9.1