Merge remote-tracking branch 'origin/master'

zengh

2021-04-25 2297c50a14f92dd869edae212d4aabe8f0bf0572

 blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -313,6 +313,7 @@

   @Override
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {

      List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
      userList.forEach(user -> {
         user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));