Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-13 2af534eea471f4adb104906c7a814bcc66d4d68d

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -89,12 +89,19 @@
    public void checkRoleAllowed(SysRole role);

    /**
     * 校验角色是否有数据权限
     *
     * @param roleId 角色id
     */
    public void checkRoleDataScope(Long roleId);

    /**
     * 通过角色ID查询角色使用数量
     *
     * @param roleId 角色ID
     * @return 结果
     */
    public int countUserRoleByRoleId(Long roleId);
    public long countUserRoleByRoleId(Long roleId);

    /**
     * 新增保存角色信息