From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 35eebc3..9ab11de 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
@@ -19,9 +19,9 @@
* @param <Q> 鏌ヨ绫�
* @return
*/
- public static <T extends AbsEntity, Q extends AbsQuery> IPage<T> getPage(Q q, Class<T> c) {
+ public static <T , 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