From a39d2d72bf8e44c037ffc55aec6af6d19679e0ba Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 16 六月 2023 16:17:22 +0800
Subject: [PATCH] 提取共用分页方法
---
src/main/java/com/whyc/controller/UserLogController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserLogController.java b/src/main/java/com/whyc/controller/UserLogController.java
index b0f847c..e4001dc 100644
--- a/src/main/java/com/whyc/controller/UserLogController.java
+++ b/src/main/java/com/whyc/controller/UserLogController.java
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛鎿嶄綔鏃ュ織
@@ -28,10 +29,10 @@
@ApiOperation(value = "鍒嗛〉")
@PostMapping("page")
- public Response<PageInfo<UserLog>> getPage(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody UserLog userLog) throws ParseException {
+ public Response<PageInfo<Object>> getPage(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody UserLog userLog) throws ParseException {
//PageInfo<UserLog> pageInfo = service.getPage(pageNum,pageSize,userLog);
- PageInfo<UserLog> pageInfo = service.getPage2(pageNum,pageSize,userLog);
- return new Response<PageInfo<UserLog>>().set(1,pageInfo);
+ PageInfo<Object> pageInfo = service.getPage2(pageNum,pageSize,userLog);
+ return new Response<PageInfo<Object>>().set(1,pageInfo);
}
@PostMapping("exportExcel")
--
Gitblit v1.9.1