From 7e57a20c0ccde504c2f2b2b9fd4a9fd7c89d5e92 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 二月 2019 16:33:38 +0800
Subject: [PATCH] 框架修改
---
fanli-common/src/main/java/com/yeshi/fanli/base/entity/user/UserInfo.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/fanli-common/src/main/java/com/yeshi/fanli/base/entity/user/UserInfo.java b/fanli-common/src/main/java/com/yeshi/fanli/base/entity/user/UserInfo.java
index 1b62ab3..b5d0a40 100644
--- a/fanli-common/src/main/java/com/yeshi/fanli/base/entity/user/UserInfo.java
+++ b/fanli-common/src/main/java/com/yeshi/fanli/base/entity/user/UserInfo.java
@@ -1,9 +1,16 @@
package com.yeshi.fanli.base.entity.user;
-import com.google.gson.annotations.Expose;
-
-import javax.persistence.*;
import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import com.google.gson.annotations.Expose;
/**
* 鐢ㄦ埛淇℃伅
@@ -18,6 +25,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)
@@ -123,7 +131,7 @@
@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)
@@ -143,7 +151,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;
@@ -187,7 +205,7 @@
tbPic = "";
portrait = "";
myHongBao = BigDecimal.valueOf(0);
- state=0;
+ state = 0;
}
public UserInfo(long id) {
--
Gitblit v1.8.0