From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 14 Dec 2023 15:38:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- 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