Merge remote-tracking branch 'origin/master'

zengh

2021-08-28 99081be70e456268640014a6369c55c5fec29f2d

 src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java

@@ -202,6 +202,11 @@
   }

   @Override
   public String Info(String id) {
      return baseMapper.Info(id);
   }

   @Override
   public List<RoleVO> search(String roleName, Long parentId) {
      LambdaQueryWrapper<Role> queryWrapper = Wrappers.<Role>query().lambda();
      if (Func.isNotEmpty(roleName)) {