From 6dfd2599d2e52507e018fd4c6b35d38873e48cfb Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 17 三月 2022 15:52:51 +0800
Subject: [PATCH] 最新版本
---
xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java | 11 ++++++-----
1 files changed, 6 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..101e2b0 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
@@ -61,7 +61,7 @@
private String mobile;
@ApiModelProperty(value = "閭")
- @Pattern(regexp = NameUtil.regEmail, message = "閭鏍煎紡涓嶆纭�")
+ //@Pattern(regexp = NameUtil.regEmail, message = "閭鏍煎紡涓嶆纭�")
private String email;
@ApiModelProperty(value = "鐪佸競鍘垮湴鍧�")
@@ -80,8 +80,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 +97,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 +117,5 @@
@TableField(exist = false)
@ApiModelProperty(value = "瀵煎叆鏁版嵁鏃朵娇鐢�")
private Integer defaultRole;
+
}
--
Gitblit v1.9.1