From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java | 19 +++++++++++++++----
1 files changed, 15 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 81d5d6f..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;// 姝ｅ父鐘舵��
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,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
@@ -152,6 +153,16 @@
@Transient
@Expose
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;
@@ -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