From 81ee25c8d585f68cd4af784b3000b583d0a03393 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 16:59:00 +0800
Subject: [PATCH] 昵称加入** bug修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
index 22e5622..3e6b129 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
@@ -11,7 +11,7 @@
import javax.persistence.Transient;
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
/**
* 鐢ㄦ埛淇℃伅
@@ -128,7 +128,7 @@
@org.yeshi.utils.mybatis.Column(name = "sid")
@ManyToOne
@JoinColumn(name = "sid")
- private System system;
+ private BusinessSystem system;
@org.yeshi.utils.mybatis.Column(name = "rank")
@Expose
@@ -149,6 +149,22 @@
@Transient
@Expose
private String rankIcon;// 绛夌骇鍥炬爣
+
+
+ // 鎬у埆: 1-濂� 2-鐢�
+ @Transient
+ @Expose
+ private Integer sex;
+
+ // 寰俊鍙�
+ @Transient
+ @Expose
+ private String weiXin;
+
+ // 寰俊鎻愮ず璇�
+ @Transient
+ @Expose
+ private String weiXinTip;
@Transient
@Expose
@@ -358,11 +374,11 @@
this.lastLoginIp = lastLoginIp;
}
- public System getSystem() {
+ public BusinessSystem getSystem() {
return system;
}
- public void setSystem(System system) {
+ public void setSystem(BusinessSystem system) {
this.system = system;
}
@@ -405,6 +421,30 @@
public void setPayPassword(String payPassword) {
this.payPassword = payPassword;
}
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getWeiXin() {
+ return weiXin;
+ }
+
+ public void setWeiXin(String weiXin) {
+ this.weiXin = weiXin;
+ }
+
+ public String getWeiXinTip() {
+ return weiXinTip;
+ }
+
+ public void setWeiXinTip(String weiXinTip) {
+ this.weiXinTip = weiXinTip;
+ }
@Override
public int hashCode() {
--
Gitblit v1.8.0