From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期五, 27 五月 2022 15:31:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs --- src/main/java/com/zy/asrs/controller/WorkController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index bc186d4..eae764b 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -154,8 +154,8 @@ @RequestMapping("/deal/preHave/start") @ManagerAuth(memo = "鍏堝叆鍝佸鐞�") public R dealPreHave(@RequestParam Integer wrkNo) { - StartupDto startupDto = workService.dealPreHaveStart(wrkNo, getUserId()); - return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + startupDto.getLocNo()); + String locNo = workService.dealPreHaveStart(wrkNo, getUserId()); + return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo); } } -- Gitblit v1.9.1