Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 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);