From 18b35f1400df83e20a870dbfd7e97ae9ca277cbd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
index 6cdf20f..6d6ec3a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
@@ -30,7 +30,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class);
- return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
+// PageParam<TaskLog, BaseParam> logs = taskLogService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
+// return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
}
@PreAuthorize("hasAuthority('manager:taskLog:list')")
--
Gitblit v1.9.1