From 2297c50a14f92dd869edae212d4aabe8f0bf0572 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 25 Apr 2021 21:21:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 7797c6c..73d0910 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/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()));

--
Gitblit v1.9.3