From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java
index 48ae818..d36d466 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java
@@ -32,6 +32,11 @@
@TableField("phone")
private String phone;
/**
+ * 手机号运营商
+ */
+ @TableField("phoneOperator")
+ private String phoneOperator;
+ /**
* 邮箱
*/
@TableField("email")
@@ -167,6 +172,19 @@
*/
@TableField("language")
private Integer language;
+ /**
+ * 推特id
+ */
+ @TableField("twitterId")
+ private String twitterId;
+
+ public String getTwitterId() {
+ return twitterId;
+ }
+
+ public void setTwitterId(String twitterId) {
+ this.twitterId = twitterId;
+ }
public Integer getuType() {
return uType;
@@ -416,6 +434,14 @@
this.language = language;
}
+ public String getPhoneOperator() {
+ return phoneOperator;
+ }
+
+ public void setPhoneOperator(String phoneOperator) {
+ this.phoneOperator = phoneOperator;
+ }
+
@Override
public String toString() {
return "UserInfo{" +
--
Gitblit v1.7.1