Merge remote-tracking branch 'origin/develop' into develop

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -23,12 +23,12 @@ sys.app.phone.unregistered={0} \u624B\u673A\u53F7\u672A\u6CE8\u518C
 sys.dict.delete.system=\u7CFB\u7EDF\u5185\u7F6E\u5B57\u5178\u9879\u76EE\u4E0D\u80FD\u5220\u9664
 sys.dict.update.system=\u7CFB\u7EDF\u5185\u7F6E\u5B57\u5178\u9879\u76EE\u4E0D\u80FD\u4FEE\u6539
 
-sys.dict.delete.existing=\u5B57\u5178\u5B58\u5728\u4E0B\u7EA7\u8282\u70B9\u4E0D\u80FD\u5931\u8D25
+sys.dict.delete.existing=\u5B57\u5178\u5B58\u5728\u4E0B\u7EA7\u8282\u70B9\u4E0D\u80FD\u5220\u9664
 
 sys.role.delete.system=\u7CFB\u7EDF\u5185\u7F6E\u89D2\u8272\u4E0D\u80FD\u5220\u9664
 sys.role.update.system=\u7CFB\u7EDF\u5185\u7F6E\u89D2\u8272\u4E0D\u80FD\u4FEE\u6539
 
-sys.role.delete.existing.user=\u8BE5\u89D2\u8272\u4E0B\u8FD8\u6709\u5173\u8054\u7684\u7528\u6237\uFF0C\u8BF7\u5148\u5C06\u7528\u6237\u8F6C\u79FB\u5230\u5176\u4ED6\u89D2\u8272%21
+sys.role.delete.existing.user=\u8BE5\u89D2\u8272\u4E0B\u8FD8\u6709\u5173\u8054\u7684\u7528\u6237\uFF0C\u8BF7\u5148\u5C06\u7528\u6237\u8F6C\u79FB\u5230\u5176\u4ED6\u89D2\u8272
 
 sys.user.update.system=\u7CFB\u7EDF\u5185\u7F6E\u7528\u6237\u4E0D\u80FD\u4FEE\u6539
 sys.user.delete.system=\u7CFB\u7EDF\u5185\u7F6E\u7528\u6237\u4E0D\u80FD\u5220\u9664

yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -84,10 +84,10 @@
 		sys_user.del_flag    AS udel_flag,
 		sys_user.lock_flag   AS lock_flag,
 		sys_user.dept_id     AS deptId,
-		sys_user.user_group  AS userGroup,
+		sys_user.user_group,
 		sys_user.post,
 		sys_user.email,
-		sys_user.system_flag AS systemFlag,
+		sys_user.system_flag,
 		r.role_id,
 		r.role_name,
 		r.role_code,
@@ -108,10 +108,10 @@
 		sys_user.update_time AS uupdate_time,
 		sys_user.del_flag    AS udel_flag,
 		sys_user.lock_flag   AS lock_flag,
-		sys_user.user_group  AS userGroup,
+		sys_user.user_group,
 		sys_user.post,
 		sys_user.email,
-		sys_user.system_flag AS systemFlag,
+		sys_user.system_flag,
 		r.role_id,
 		r.role_name,
 		r.role_code,
@@ -154,10 +154,10 @@
 			   sys_user.del_flag    AS udel_flag,
 			   sys_user.lock_flag   AS lock_flag,
 			   sys_user.dept_id     AS deptId,
-			   sys_user.user_group  AS userGroup,
+			   sys_user.user_group,
 			   sys_user.post,
 			   sys_user.email,
-			   sys_user.system_flag AS systemFlag,
+			   sys_user.system_flag,
 			   sys_dept.name        AS deptName
 		FROM sys_user
 					 LEFT JOIN sys_dept ON sys_dept.dept_id = sys_user.dept_id
@@ -185,9 +185,9 @@
 			   u.del_flag,
 			   u.lock_flag,
 			   u.group,
-			   u.user_group userGroup,
+			   u.user_group,
 			   u.email,
-			   u.system_flag systemFlag,
+			   u.system_flag,
 			   d.name AS     deptName
 		FROM sys_user u
 					 LEFT JOIN sys_dept d ON d.dept_id = u.dept_id