Merge remote-tracking branch 'origin/master'

wangfei

2024-10-21 8785b6b5ee9298308752b53bf546953ae49b8c88

 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));
    }