From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 4a8da48..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;
@@ -153,6 +158,11 @@
*/
@TableField("uid")
private Integer uid;
+ /**
+ * 语言类型（1=简体中文，2=英语，3=法语）
+ */
+ @TableField("language")
+ private Integer language;
public Integer getId() {
@@ -193,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() {
@@ -402,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;
--
Gitblit v1.7.1