From fc96e4d7fc20dbec5d2d96c6e8c557c1cc3212d3 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 08 四月 2024 18:53:10 +0800
Subject: [PATCH] 修改密码错误登录bug
---
xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
index 55077a0..84f4529 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,6 +39,7 @@
@Table(name = "t_user")
@TableName("t_user")
@ApiModel(value = "鐢ㄦ埛")
+@JsonIgnoreProperties(value = {"password"})
public class User extends XbootBaseEntity {
private static final long serialVersionUID = 1L;
@@ -61,7 +63,7 @@
private String mobile;
@ApiModelProperty(value = "閭")
- @Pattern(regexp = NameUtil.regEmail, message = "閭鏍煎紡涓嶆纭�")
+ //@Pattern(regexp = NameUtil.regEmail, message = "閭鏍煎紡涓嶆纭�")
private String email;
@ApiModelProperty(value = "鐪佸競鍘垮湴鍧�")
@@ -80,8 +82,11 @@
@ApiModelProperty(value = "鐢ㄦ埛澶村儚")
private String avatar = CommonConstant.USER_DEFAULT_AVATAR;
- @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鏅�氱敤鎴� 1绠＄悊鍛�")
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鏅�氱敤鎴� 1绠＄悊鍛� ")
private Integer type = CommonConstant.USER_TYPE_NORMAL;
+
+ @ApiModelProperty(value = "0:鍙告満 1锛氶厤閫佸憳")
+ private Integer type2;
@ApiModelProperty(value = "鐘舵�� 榛樿0姝ｅ父 -1鎷夐粦")
private Integer status = CommonConstant.USER_STATUS_NORMAL;
@@ -94,9 +99,6 @@
@ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�")
private String departmentTitle;
-
- @ApiModelProperty(value = "鎸囩汗鐧婚檰瀵嗙爜")
- private String key;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -117,4 +119,5 @@
@TableField(exist = false)
@ApiModelProperty(value = "瀵煎叆鏁版嵁鏃朵娇鐢�")
private Integer defaultRole;
+
}
--
Gitblit v1.9.1