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/lexConsumable/lexConsumable.html | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.html b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
index 9ecb2d7..e8dbd38 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.html
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
@@ -681,7 +681,10 @@
onfirst={goFirstPage}
onlast={goLastPage}
page-size-options={pageSizeOptions}
+<<<<<<< HEAD
+=======
default-page-size={pageSize}
+>>>>>>> LEXCommunityLiJun
previous-button-disabled={previousButtonDisabled}
next-button-disabled={nextButtonDisabled}
record-start={recordStart}
@@ -708,7 +711,10 @@
onfirst={goFirstPage}
onlast={goLastPage}
page-size-options={pageSizeOptions}
+<<<<<<< HEAD
+=======
default-page-size={pageSize}
+>>>>>>> LEXCommunityLiJun
previous-button-disabled={previousButtonDisabled}
next-button-disabled={nextButtonDisabled}
record-start={recordStart}
@@ -1099,4 +1105,8 @@
<div class="slds-backdrop slds-backdrop_open"></div>
</template>
</template>
-</template>
\ No newline at end of file
+<<<<<<< HEAD
+</template>
+=======
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1