Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java

@@ -96,8 +96,9 @@
        if (Objects.isNull(roleId)) {
            throw new GunsException(BizExceptionEnum.REQUEST_NULL);
        }
        Role role = roleService.getById(roleId);
        model.addAttribute("roleId", roleId);
        model.addAttribute("roleName", ConstantFactory.me().getSingleRoleName(roleId));
        model.addAttribute("roleName", role.getName());
        return PREFIX + "/role_assign.html";
    }