Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-01-08 3a06ce5786fb65f4a015a18b82e867b288a60032

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java

@@ -47,7 +47,7 @@
    }


    @SaCheckPermission("userList.search")
    @SaCheckPermission("userList.delete")
    @ApiOperation("删除用户")
    @PostMapping("/userDelete/{id}")
    public Result userDelete(@PathVariable Integer id) {
@@ -61,4 +61,18 @@
    public Result findAll(){
        return Result.seccess(userService.findAll());
    }

    @ApiOperation("查询所有工序")
    @SaCheckPermission("userList.search")
    @PostMapping("selectProcess")
    public Result selectProcess(){
        return Result.seccess(userService.selectProcessSv());
    }

    @ApiOperation("修改用户工序")
    @SaCheckPermission("userList.search")
    @PostMapping("updateProcess/{id}/{process}")
    public Result updateProcess(@PathVariable Integer id,@PathVariable String process){
        return Result.seccess(userService.updateProcessSv(id,process));
    }
}