From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 58 insertions(+), 7 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 af80d0b..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;
 
 /**
  * 鐢ㄦ埛淇℃伅
@@ -26,6 +26,7 @@
 	public static int STATE_NORMAL = 0;// 姝ｅ父鐘舵��
 	public static int STATE_DELETE = 1;// 鍒犻櫎鐘舵��
 	public static int STATE_FORBIDDEN = 2;// 灏佺鐘舵��
+	public static int STATE_DELETE_OUT_OF_DATE = 4;// 鐢ㄦ埛闀挎湡涓嶆椿璺冭鍒犻櫎
 
 	@Id
 	// @GeneratedValue(strategy = GenerationType.SEQUENCE)
@@ -127,11 +128,11 @@
 	@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
-	private Integer rank;// 0 鏅��  1 閾�  2閾� 3 閲�
+	private Integer rank;// 0 鏅�� 1 閾� 2閾� 3 閲�
 
 	@org.yeshi.utils.mybatis.Column(name = "phone")
 	@Column(name = "phone", length = 16)
@@ -148,10 +149,36 @@
 	@Transient
 	@Expose
 	private String rankIcon;// 绛夌骇鍥炬爣
+	
+
+	// 鎬у埆: 1-濂�  2-鐢�
+	@Transient
+	@Expose
+	private Integer sex;
+	
+	// 寰俊鍙�
+	@Transient
+	@Expose
+	private String weiXin;
+	
+	// 寰俊鎻愮ず璇�
+	@Transient
+	@Expose
+	private String weiXinTip;
 
 	@Transient
 	@Expose
-	private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖 
+	private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
+	@Transient
+	private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
+
+	public String getTaoBaoUid() {
+		return taoBaoUid;
+	}
+
+	public void setTaoBaoUid(String taoBaoUid) {
+		this.taoBaoUid = taoBaoUid;
+	}
 
 	public Integer getState() {
 		return state;
@@ -195,7 +222,7 @@
 		tbPic = "";
 		portrait = "";
 		myHongBao = BigDecimal.valueOf(0);
-		state=0;
+		state = 0;
 	}
 
 	public UserInfo(long id) {
@@ -347,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;
 	}
 
@@ -394,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