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

liyong

昨天 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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

@@ -85,9 +85,9 @@
    /**

     * 校验角色是否有数据权限

     * 

     * @param roleId 角色id

     * @param roleIds 角色id

     */

    public void checkRoleDataScope(Long roleId);

    public void checkRoleDataScope(Long... roleIds);



    /**

     * 通过角色ID查询角色使用数量