From cffbaec750882dd7f4d112d7c735d247e2a961a7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 10 十一月 2023 13:32:50 +0800
Subject: [PATCH] #

---
 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