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

chenlu

2025-12-09 92f4295f9b3255f8615775d3a254c2e7f20409c1

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

@@ -29,6 +29,6 @@
    @SaCheckPermission("userList.update")
    @PostMapping("/updateUserRole")
    public Result updateUserRole(@RequestBody Map<String,Object> params) {
        return Result.seccess(userRoleService.updateUserRole(params));
        return Result.success(userRoleService.updateUserRole(params));
    }
}