Merge remote-tracking branch 'origin/dev_dz' into dev_dz

zhuo

2025-03-14 eb07dec15baddab47a4b879a7b1841285b835a49

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -33,7 +33,7 @@

/**
 * 角色信息
 * 
 *
 * @author ruoyi
 */
@RestController
@@ -125,7 +125,7 @@
            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }
        role.setUpdateBy(getUsername());
        

        if (roleService.updateRole(role) > 0)
        {
            // 更新缓存用户权限