From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java | 133 ++++++++++++++++++++++++++++++++------------ 1 files changed, 97 insertions(+), 36 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..d8eb21b 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,54 @@ /* 灏佺璐﹀彿 */ - 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; + // 鍓╀綑閲戝竵鏁伴噺 + private int goldCoin; + // 鐢ㄦ埛鏍囪瘑 + private String mark; + + // 鐢ㄦ埛VIP绛夌骇 + private String userLevel; + + // 閭�璇风爜 + private String inviteCode; + + + + 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 +168,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 +304,84 @@ 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 void setTbRelationId(String tbRelationId) { + this.tbRelationId = tbRelationId; } - public String getRankPicture() { - return rankPicture; + public int getGoldCoin() { + return goldCoin; } - public void setRankPicture(String rankPicture) { - this.rankPicture = rankPicture; + public void setGoldCoin(int goldCoin) { + this.goldCoin = goldCoin; + } + + public String getMark() { + return mark; + } + + public void setMark(String mark) { + this.mark = mark; + } + + public String getUserLevel() { + return userLevel; + } + + public void setUserLevel(String userLevel) { + this.userLevel = userLevel; + } + + public String getInviteCode() { + return inviteCode; + } + + public void setInviteCode(String inviteCode) { + this.inviteCode = inviteCode; } } -- Gitblit v1.8.0