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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 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查询角色使用数量