Merge remote-tracking branch 'origin/master'

zengh

2021-08-13 05d218bdda3f09aa5d057fda916f5f0b668fb720

 src/main/java/org/springblade/modules/system/service/IRoleService.java

@@ -46,7 +46,7 @@
    * @param tenantId
    * @return
    */
   List<RoleVO> tree(String tenantId);
   List<RoleVO> tree(String tenantId,Long deptId);

   /**
    * 权限配置