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/lexConsumable/lexConsumable.js | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index 5a006be..714e78a 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -85,9 +85,15 @@
@track sortedBy;
//鍒嗛〉
@track currentPage = 1;
+<<<<<<< HEAD
+ @track pageSize = 10;
+ // @track totalPage = 0;
+ @track pageSizeOptions = [10, 25, 50, 100];
+=======
@track pageSize = 200;
// @track totalPage = 0;
@track pageSizeOptions = [100, 200,300];
+>>>>>>> LEXCommunityLiJun
@track recordStart = 0;
@track recordEnd = 0;
//鎶ラ敊鎻愰啋
@@ -1775,4 +1781,8 @@
get nextButtonDisabled() {
return this.currentPage == this.totalPage;
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1