Merge remote-tracking branch 'origin/master'

zengh

2021-09-10 3b1bba4cae03694d1364115b9cd539bee066ce7e

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

@@ -100,6 +100,6 @@
    * @return
    */
   List<RoleVO> search(String roleName, Long parentId);

   List selectRole();

}