diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 027f4ab1..87e75d13 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -416,6 +416,7 @@ export default { { required: true, message: "用户密码不能为空", trigger: "blur" } ], email: [ + { required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "'请输入正确的邮箱地址", @@ -423,6 +424,7 @@ export default { } ], phonenumber: [ + { required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", @@ -448,7 +450,7 @@ export default { this.sexOptions = response.data; }); this.getConfigKey("sys.user.initPassword").then(response => { - this.initPassword = response.data; + this.initPassword = response.msg; }); }, methods: { @@ -660,4 +662,4 @@ export default { } } }; - \ No newline at end of file + diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java index 8c461b1a..74cb754b 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java @@ -7,6 +7,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type; @@ -196,6 +197,7 @@ public class SysUser extends BaseEntity this.avatar = avatar; } + @JsonProperty public String getPassword() { return password;