From 9af336a5be2483d67b5dbbf02d87e1e54185014f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 23 七月 2024 14:52:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
index 7b0cc50..14b6578 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
@@ -45,6 +45,11 @@
*/
private String phone;
/**
+ * 手机号运营商
+ */
+ @TableField("phoneOperator")
+ private String phoneOperator;
+ /**
* 昵称
*/
private String nickName;
@@ -65,6 +70,19 @@
*/
private String emergencyContact;
/**
+ * 邮箱
+ */
+ private String email;
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ /**
* 紧急联系电话
*/
private String emergencyContactNumber;
@@ -73,9 +91,13 @@
*/
private Integer isAuth;
/**
- * 真实姓名
+ * 姓氏
*/
- private String name;
+ private String lastName;
+ /**
+ * 名字
+ */
+ private String firstName;
/**
* 身份证号
*/
@@ -136,6 +158,11 @@
*/
@TableField("uid")
private Integer uid;
+ /**
+ * 语言类型（1=简体中文，2=英语，3=法语）
+ */
+ @TableField("language")
+ private Integer language;
public Integer getId() {
@@ -176,6 +203,14 @@
public void setPhone(String phone) {
this.phone = phone;
+ }
+
+ public String getPhoneOperator() {
+ return phoneOperator;
+ }
+
+ public void setPhoneOperator(String phoneOperator) {
+ this.phoneOperator = phoneOperator;
}
public String getNickName() {
@@ -234,12 +269,20 @@
this.isAuth = isAuth;
}
- public String getName() {
- return name;
+ public String getLastName() {
+ return lastName;
}
- public void setName(String name) {
- this.name = name;
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
}
public String getIdCard() {
@@ -377,7 +420,15 @@
public void setUid(Integer uid) {
this.uid = uid;
}
-
+
+ public Integer getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(Integer language) {
+ this.language = language;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -398,7 +449,6 @@
", emergencyContact='" + emergencyContact + '\'' +
", emergencyContactNumber='" + emergencyContactNumber + '\'' +
", isAuth=" + isAuth +
- ", name='" + name + '\'' +
", idCard='" + idCard + '\'' +
", idCardFront='" + idCardFront + '\'' +
", idCardReverse='" + idCardReverse + '\'' +
--
Gitblit v1.7.1