From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java |   25 ++++++++++++++++++-------
 1 files changed, 18 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..c41496f 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;// 姝e父鐘舵��
 	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)
@@ -151,7 +152,17 @@
 
 	@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 +206,7 @@
 		tbPic = "";
 		portrait = "";
 		myHongBao = BigDecimal.valueOf(0);
-		state=0;
+		state = 0;
 	}
 
 	public UserInfo(long id) {
@@ -347,11 +358,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;
 	}
 

--
Gitblit v1.8.0