From d2ef5afff8240c78616b2b4732d1bcd0eb8a248a Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期六, 17 六月 2023 10:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/controller/UserLogController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserLogController.java b/src/main/java/com/whyc/controller/UserLogController.java
index e3b80b6..e4001dc 100644
--- a/src/main/java/com/whyc/controller/UserLogController.java
+++ b/src/main/java/com/whyc/controller/UserLogController.java
@@ -12,7 +12,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛鎿嶄綔鏃ュ織
@@ -27,10 +29,10 @@
@ApiOperation(value = "鍒嗛〉")
@PostMapping("page")
- public Response<PageInfo<UserLog>> getPage(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody UserLog userLog){
+ 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