Merge remote-tracking branch 'origin/temp-pre' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1740,6 +1740,7 @@ public class SysUserController {
 				for (UserVO sysUser : sysUserList) {
 					Map<String, String> map = new HashMap<>();
 					map.put("id", sysUser.getUserId() + "");
+					map.put("username", sysUser.getUsername() + "");
 					map.put("realname", sysUser.getRealname() + "");
 					answerList.add(map);
 				}
@@ -1759,6 +1760,7 @@ public class SysUserController {
 				for (UserVO sysUser : sysUserList) {
 					Map<String, String> map = new HashMap<>();
 					map.put("id", sysUser.getUserId() + "");
+					map.put("username", sysUser.getUsername() + "");
 					map.put("realname", sysUser.getRealname() + "");
 					answerList.add(map);
 				}