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/paginatedList/paginatedList.html |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/paginatedList/paginatedList.html b/force-app/main/default/lwc/paginatedList/paginatedList.html
index 808aba7..e4c7e1a 100644
--- a/force-app/main/default/lwc/paginatedList/paginatedList.html
+++ b/force-app/main/default/lwc/paginatedList/paginatedList.html
@@ -1,6 +1,9 @@
 <template>
     <template if:true={loader}>
-        <lightning-spinner alternative-text="Loading..." size="small"></lightning-spinner>
+        <lightning-spinner
+            alternative-text="Loading..."
+            size="small"
+        ></lightning-spinner>
     </template>
     <template if:true={records}>
         <div class="table-container">
@@ -14,14 +17,13 @@
             >
             </lightning-datatable>
         </div>
-        <c-paginator    
-            if:true={paginationVisibility}
+        <c-paginator
             onprevious={handlePrevious}
             onnext={handleNext}
             onpageschange={handlePageschange}
             onfirst={handleFirst}
             onlast={handleLast}
-            page-size-options={pageSizeOptions}          
+            page-size-options={pageSizeOptions}
             previous-button-disabled={previousButtonDisabled}
             next-button-disabled={nextButtonDisabled}
             record-start={recordStart}
@@ -32,4 +34,4 @@
     <template if:true={error}>
         <c-error-panel errors={error}></c-error-panel>
     </template>
-</template>
\ No newline at end of file
+</template>

--
Gitblit v1.9.1