From 537116ddbb453003f45f73be0228ec150f60b4ab Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 22 Jul 2023 17:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/lists/BaseDataLists.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/lists/BaseDataLists.php b/app/common/lists/BaseDataLists.php
index cf07d0d46..44178be53 100755
--- a/app/common/lists/BaseDataLists.php
+++ b/app/common/lists/BaseDataLists.php
@@ -95,8 +95,8 @@ abstract class BaseDataLists implements ListsInterface
 
         if ($this->pageType == 1) {
             //分页
-            $this->pageNo = $this->request->get('page_no', 1) ?: 1;
-            $this->pageSize = $this->request->get('page_size', $this->pageSize) ?: $this->pageSize;
+            $this->pageNo = $this->request->get('page_no', $this->request->get('page', 1)) ?: 1;
+            $this->pageSize = $this->request->get('page_size', $this->request->get('limit', $this->pageSize)) ?: $this->pageSize;
         } else {
             //不分页
             $this->pageNo = 1;//强制到第一页