From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java
index 0a73bb5..29b53fb 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserUpdateForm.java
@@ -34,6 +34,8 @@
private String wechat;
+ private String userName;
+
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date expireTime;
@@ -55,6 +57,7 @@
public User formConvertEntity(){
User user = new User();
user.setId(id);
+ user.setUserName(userName);
if (!ObjectUtils.isEmpty(password))
user.setPassword(MD5Utils.saltMD5(AESUtils.decrypt(password)));
user.setEmail(email);
--
Gitblit v1.8.0