From 0496f6d9fa11ccc0acb8892d4739c7a9661ba081 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 02 八月 2024 14:13:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java index 582dafe..7cc83b8 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * <p> @@ -28,7 +29,9 @@ private WorkAssignmentService workAssignmentService; @ApiOperation("鍊肩彮鏁版嵁鏌ヨ") @PostMapping("/selectWorkAssignment") - public Result selectWorkAssignment(int line,String workingProcedure) { + public Result selectWorkAssignment(@RequestBody Map map) { + String line=map.get("line").toString(); + String workingProcedure=map.get("workingProcedure").toString(); return Result.build(200,"鏌ヨ鎴愬姛",workAssignmentService.selectWorkAssignment(line,workingProcedure)); } -- Gitblit v1.8.0