From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 10:45:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java |   97 ++++++++++++++++++++++++++++--------------------
 1 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
index aa7b95f..b5a1da7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java
@@ -59,9 +59,8 @@
 	private String accountNameWX;
 	// 绱杞处-寰俊
 	private double totalMoneyWX;
-	
-	
 
+	
 	private int wxUnionIdState; // 寰俊unionId鐘舵��
 
 	private int taobaoUidState; // 娣樺疂ID鐘舵��
@@ -72,16 +71,42 @@
 
 	
 	/* 灏佺璐﹀彿  */
-	private String f_wxUnionId; // 寰俊unionId
+	private String wxUnionIdInvalid; // 寰俊unionId
 
-	private String f_taobaoUid; // 娣樺疂ID
+	private String taobaoUidInvalid; // 娣樺疂ID
 
-	private String f_phone; // 鎵嬫満鍙�
+	private String phoneInvalid; // 鎵嬫満鍙�
 
-	private String f_alipayAccount; // 鏀粯瀹濊处鍙�
+	private String alipayAccountInvalid; // 鏀粯瀹濊处鍙�
 	
 	
+	private String tbSpecialId;
+	private String tbRelationId;
 	
+
+	public String getRankId() {
+		return rankId;
+	}
+
+	public void setRankId(String rankId) {
+		this.rankId = rankId;
+	}
+
+	public String getRankName() {
+		return rankName;
+	}
+
+	public void setRankName(String rankName) {
+		this.rankName = rankName;
+	}
+
+	public String getRankPicture() {
+		return rankPicture;
+	}
+
+	public void setRankPicture(String rankPicture) {
+		this.rankPicture = rankPicture;
+	}
 
 	public String getUnaccountedMoney() {
 		return unaccountedMoney;
@@ -131,11 +156,11 @@
 		this.totalOrder = totalOrder;
 	}
 
-	public long getLastOrderTime() {
+	public Long getLastOrderTime() {
 		return lastOrderTime;
 	}
 
-	public void setLastOrderTime(long lastOrderTime) {
+	public void setLastOrderTime(Long lastOrderTime) {
 		this.lastOrderTime = lastOrderTime;
 	}
 
@@ -267,60 +292,52 @@
 		this.alipayAccountState = alipayAccountState;
 	}
 
-	public String getF_wxUnionId() {
-		return f_wxUnionId;
+	public String getWxUnionIdInvalid() {
+		return wxUnionIdInvalid;
 	}
 
-	public void setF_wxUnionId(String f_wxUnionId) {
-		this.f_wxUnionId = f_wxUnionId;
+	public void setWxUnionIdInvalid(String wxUnionIdInvalid) {
+		this.wxUnionIdInvalid = wxUnionIdInvalid;
 	}
 
-	public String getF_taobaoUid() {
-		return f_taobaoUid;
+	public String getTaobaoUidInvalid() {
+		return taobaoUidInvalid;
 	}
 
-	public void setF_taobaoUid(String f_taobaoUid) {
-		this.f_taobaoUid = f_taobaoUid;
+	public void setTaobaoUidInvalid(String taobaoUidInvalid) {
+		this.taobaoUidInvalid = taobaoUidInvalid;
 	}
 
-	public String getF_phone() {
-		return f_phone;
+	public String getPhoneInvalid() {
+		return phoneInvalid;
 	}
 
-	public void setF_phone(String f_phone) {
-		this.f_phone = f_phone;
+	public void setPhoneInvalid(String phoneInvalid) {
+		this.phoneInvalid = phoneInvalid;
 	}
 
-	public String getF_alipayAccount() {
-		return f_alipayAccount;
+	public String getAlipayAccountInvalid() {
+		return alipayAccountInvalid;
 	}
 
-	public void setF_alipayAccount(String f_alipayAccount) {
-		this.f_alipayAccount = f_alipayAccount;
+	public void setAlipayAccountInvalid(String alipayAccountInvalid) {
+		this.alipayAccountInvalid = alipayAccountInvalid;
 	}
 
-	public String getRankId() {
-		return rankId;
+	public String getTbSpecialId() {
+		return tbSpecialId;
 	}
 
-	public void setRankId(String rankId) {
-		this.rankId = rankId;
+	public void setTbSpecialId(String tbSpecialId) {
+		this.tbSpecialId = tbSpecialId;
 	}
 
-	public String getRankName() {
-		return rankName;
+	public String getTbRelationId() {
+		return tbRelationId;
 	}
 
-	public void setRankName(String rankName) {
-		this.rankName = rankName;
-	}
-
-	public String getRankPicture() {
-		return rankPicture;
-	}
-
-	public void setRankPicture(String rankPicture) {
-		this.rankPicture = rankPicture;
+	public void setTbRelationId(String tbRelationId) {
+		this.tbRelationId = tbRelationId;
 	}
 	
 }

--
Gitblit v1.8.0