From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platform/src/components/common/Pagination.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/platform/src/components/common/Pagination.vue b/platform/src/components/common/Pagination.vue
index 975a875..86ea4d2 100644
--- a/platform/src/components/common/Pagination.vue
+++ b/platform/src/components/common/Pagination.vue
@@ -2,7 +2,7 @@
   <div class="table-pagination">
     <el-pagination
       :current-page="pagination.pageIndex"
-      :page-sizes="[10, 20, 30, 40]"
+      :page-sizes="pagination.pageSizes||[10, 20, 30, 40]"
       :page-size="pagination.pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="pagination.total"

--
Gitblit v1.9.3