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

廖井涛

2024-05-11 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c

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