From 2632e1b05c4f68cc49b9acb3b3a8847cc0ed86e2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 08:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 61e94e1..d87a31c 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -55,7 +55,8 @@
param.remove("update_time");
}
}
- return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
+ Page<ManLocDetl> page = manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class));
+ return R.ok(page);
}
@@ -75,7 +76,7 @@
@RequestMapping("/manLocDetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
- manLocDetlService.adjustLocDetl(param, getUserId());
+ manLocDetlService.adjustLocDetl(param, getUserId(),getUser());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@@ -110,4 +111,6 @@
}
+
+
}
--
Gitblit v1.9.1