From fc5ac628bb8031c33a37dfc49990b7fe84757ef4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 18 三月 2024 17:32:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java b/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
index 0a69621..7f1defe 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.system.domain.base.AbsEntity;
-import com.ycl.system.domain.base.AbsQuery;
+import com.ycl.platform.base.AbsEntity;
+import com.ycl.platform.base.AbsQuery;
/**
* 鍒嗛〉宸ュ叿绫�
@@ -21,7 +21,7 @@
*/
public static <T extends AbsEntity, Q extends AbsQuery> IPage<T> getPage(Q q, Class<T> c) {
Page<T> page = new Page<T>()
- .setCurrent(q.getCurrentPage())
+ .setCurrent(q.getPageNum())
.setSize(q.getPageSize());
return page;
}
--
Gitblit v1.8.0