Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

 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)
        {
            // 更新缓存用户权限