From 736a697381d0cc52c1c2213cd66740b83d6d81d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 四月 2021 19:24:51 +0800
Subject: [PATCH] bug修改

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java |  539 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 263 insertions(+), 276 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java
index 7c374c0..938c152 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java
@@ -1,276 +1,263 @@
-package com.yeshi.fanli.entity.bus.user;
-
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-import com.google.gson.annotations.Expose;
-
-/**
- * 鐢ㄦ埛闄勫姞淇℃伅
- * 
- * @author Administrator
- *
- */
-@Table("yeshi_ec_user_info_extra")
-public class UserInfoExtra {
-
-	public static int INVITE_CODE_SATTE_VALID_NO_UPDATE = 1;// 姝ｅ父-鏈慨鏀硅繃
-	public static int INVITE_CODE_SATTE_VALID_UPDATED = 2;// 涓嶆甯�-鏈慨鏀硅繃
-
-	@Column(name = "uie_id")
-	private Long id;
-
-	// 鐢ㄦ埛id
-	@Expose
-	@Column(name = "uie_uid")
-	private UserInfo userInfo;
-
-	// 绛夌骇id
-	@Expose
-	@Column(name = "uie_rank_id")
-	private UserRank userRank;
-
-	// 绛夌骇鏉ユ簮锛氳繑鍒┿�佸垎浜�侀個璇�
-	@Column(name = "uie_rank_source")
-	private Integer rankSource;
-
-	// 绛夌骇鍒ゆ柇璁㈠崟鏁伴噺
-	@Column(name = "uie_rank_order_num")
-	private Integer rankOrderNum;
-
-	// 绛夌骇鏇存柊鏃堕棿
-	@Expose
-	@Column(name = "uie_rank_update_time")
-	private Date rankUpdateTime;
-
-	// 閭�璇风爜
-	@Column(name = "uie_invite_code")
-	private String inviteCode;
-
-	// 鏂颁汉鎶藉娆℃暟
-	@Column(name = "uie_lottery_newbies")
-	private Integer lotteryNewbies;
-
-	// 鍒告湭璇绘暟閲�
-	@Column(name = "uie_coupon_news")
-	private Integer couponNews;
-
-	// 鏄惁鍚屾瀵艰埅鏍�
-	@Column(name = "uie_synch_navbar")
-	private Boolean synchNavbar;
-
-	// 棣栨鐧诲綍鏃堕棿
-	@Column(name = "uie_first_login_time")
-	private Date firstLoginTime;
-
-	// 鎬у埆: 1-濂� 2-鐢�
-	@Column(name = "uie_sex")
-	private Integer sex;
-
-	// 寰俊鍙�
-	@Column(name = "uie_weixin")
-	private String weiXin;
-
-	// 閲戝竵鏁伴噺
-	@Column(name = "uie_gold_coin")
-	private Integer goldCoin;
-
-	// 鏄惁寰俊鑷嫊鎻愮従
-	@Column(name = "uie_auto_extract")
-	private Boolean autoExtract;
-
-	// 寰俊鑷姩鎻愮幇鍏抽棴鏃ユ湡
-	@Column(name = "uie_close_time_extract")
-	private Date closeTimeExtract;
-
-	// 鐢ㄦ埛鏍囪瘑
-	@Column(name = "uie_mark")
-	private String mark;
-
-	// 鐢ㄦ埛鏈�杩戞椿璺冩椂闂�
-	@Column(name = "uie_active_time")
-	private Date activeTime;
-
-	// 閭�璇风爜鐘舵��
-	@Column(name = "uie_invite_code_state")
-	private Integer inviteCodeState;// 0-鏃犳晥 1-鏈慨鏀规湁鏁� 2-淇敼鏈夋晥
-
-	// 鍒涘缓鏃堕棿
-	@Column(name = "uie_create_time")
-	private Date createTime;
-
-	// 鏇存柊鏃堕棿
-	@Column(name = "uie_update_time")
-	private Date updateTime;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public UserRank getUserRank() {
-		return userRank;
-	}
-
-	public void setUserRank(UserRank userRank) {
-		this.userRank = userRank;
-	}
-
-	public Date getRankUpdateTime() {
-		return rankUpdateTime;
-	}
-
-	public void setRankUpdateTime(Date rankUpdateTime) {
-		this.rankUpdateTime = rankUpdateTime;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public UserInfo getUserInfo() {
-		return userInfo;
-	}
-
-	public void setUserInfo(UserInfo userInfo) {
-		this.userInfo = userInfo;
-	}
-
-	public Integer getRankSource() {
-		return rankSource;
-	}
-
-	public void setRankSource(Integer rankSource) {
-		this.rankSource = rankSource;
-	}
-
-	public Integer getRankOrderNum() {
-		return rankOrderNum;
-	}
-
-	public void setRankOrderNum(Integer rankOrderNum) {
-		this.rankOrderNum = rankOrderNum;
-	}
-
-	public String getInviteCode() {
-		return inviteCode;
-	}
-
-	public void setInviteCode(String inviteCode) {
-		this.inviteCode = inviteCode;
-	}
-
-	public Integer getLotteryNewbies() {
-		return lotteryNewbies;
-	}
-
-	public void setLotteryNewbies(Integer lotteryNewbies) {
-		this.lotteryNewbies = lotteryNewbies;
-	}
-
-	public Integer getCouponNews() {
-		return couponNews;
-	}
-
-	public void setCouponNews(Integer couponNews) {
-		this.couponNews = couponNews;
-	}
-
-	public Date getFirstLoginTime() {
-		return firstLoginTime;
-	}
-
-	public void setFirstLoginTime(Date firstLoginTime) {
-		this.firstLoginTime = firstLoginTime;
-	}
-
-	public Boolean getSynchNavbar() {
-		return synchNavbar;
-	}
-
-	public void setSynchNavbar(Boolean synchNavbar) {
-		this.synchNavbar = synchNavbar;
-	}
-
-	public Integer getSex() {
-		return sex;
-	}
-
-	public void setSex(Integer sex) {
-		this.sex = sex;
-	}
-
-	public String getWeiXin() {
-		return weiXin;
-	}
-
-	public void setWeiXin(String weiXin) {
-		this.weiXin = weiXin;
-	}
-
-	public Integer getGoldCoin() {
-		return goldCoin;
-	}
-
-	public void setGoldCoin(Integer goldCoin) {
-		this.goldCoin = goldCoin;
-	}
-
-	public Boolean getAutoExtract() {
-		return autoExtract;
-	}
-
-	public void setAutoExtract(Boolean autoExtract) {
-		this.autoExtract = autoExtract;
-	}
-
-	public Date getCloseTimeExtract() {
-		return closeTimeExtract;
-	}
-
-	public void setCloseTimeExtract(Date closeTimeExtract) {
-		this.closeTimeExtract = closeTimeExtract;
-	}
-
-	public String getMark() {
-		return mark;
-	}
-
-	public void setMark(String mark) {
-		this.mark = mark;
-	}
-
-	public Date getActiveTime() {
-		return activeTime;
-	}
-
-	public void setActiveTime(Date activeTime) {
-		this.activeTime = activeTime;
-	}
-
-	public Integer getInviteCodeState() {
-		return inviteCodeState;
-	}
-
-	public void setInviteCodeState(Integer inviteCodeState) {
-		this.inviteCodeState = inviteCodeState;
-	}
-
-}
+package com.yeshi.fanli.entity.bus.user;
+
+import java.util.Date;
+
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * 鐢ㄦ埛闄勫姞淇℃伅
+ * 
+ * @author Administrator
+ *
+ */
+@Table("yeshi_ec_user_info_extra")
+public class UserInfoExtra {
+
+	@Column(name = "uie_id")
+	private Long id;
+
+	// 鐢ㄦ埛id
+	@Expose
+	@Column(name = "uie_uid")
+	private UserInfo userInfo;
+
+	// 绛夌骇id
+	@Expose
+	@Column(name = "uie_rank_id")
+	private UserRank userRank;
+
+	// 绛夌骇鏉ユ簮锛氳繑鍒┿�佸垎浜�侀個璇�
+	@Column(name = "uie_rank_source")
+	private Integer rankSource;
+
+	// 绛夌骇鍒ゆ柇璁㈠崟鏁伴噺
+	@Column(name = "uie_rank_order_num")
+	private Integer rankOrderNum;
+
+	// 绛夌骇鏇存柊鏃堕棿
+	@Expose
+	@Column(name = "uie_rank_update_time")
+	private Date rankUpdateTime;
+
+	// 閭�璇风爜
+	@Column(name = "uie_invite_code")
+	private String inviteCode;
+
+	// 閭�璇风爜-浼氬憳
+	@Column(name = "uie_invite_code_vip")
+	private String inviteCodeVip; 
+	
+
+	// 鍒告湭璇绘暟閲�
+	@Column(name = "uie_coupon_news")
+	private Integer couponNews;
+
+	// 鏄惁鍚屾瀵艰埅鏍�
+	@Column(name = "uie_synch_navbar")
+	private Boolean synchNavbar;
+
+	// 棣栨鐧诲綍鏃堕棿
+	@Column(name = "uie_first_login_time")
+	private Date firstLoginTime;
+
+	// 鎬у埆: 1-濂� 2-鐢�
+	@Column(name = "uie_sex")
+	private Integer sex;
+
+	// 寰俊鍙�
+	@Column(name = "uie_weixin")
+	private String weiXin;
+
+	// 閲戝竵鏁伴噺
+	@Column(name = "uie_gold_coin")
+	private Integer goldCoin;
+
+	// 鐢ㄦ埛鏍囪瘑
+	@Column(name = "uie_mark")
+	private String mark;
+
+	// 鐢ㄦ埛鏈�杩戞椿璺冩椂闂�
+	@Column(name = "uie_active_time")
+	private Date activeTime;
+
+	// 浜岀淮鐮�
+	@Column(name = "uie_ercode")
+	private String erCode;
+		
+	// 鏄窐瀹濇巿鏉�
+	@Column(name = "uie_bind_taobao")
+	private Boolean bindTaoBao;
+	
+	// 鍒涘缓鏃堕棿
+	@Column(name = "uie_create_time")
+	private Date createTime;
+
+	// 鏇存柊鏃堕棿
+	@Column(name = "uie_update_time")
+	private Date updateTime;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public UserRank getUserRank() {
+		return userRank;
+	}
+
+	public void setUserRank(UserRank userRank) {
+		this.userRank = userRank;
+	}
+
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public UserInfo getUserInfo() {
+		return userInfo;
+	}
+
+	public void setUserInfo(UserInfo userInfo) {
+		this.userInfo = userInfo;
+	}
+
+	public Integer getRankSource() {
+		return rankSource;
+	}
+
+	public void setRankSource(Integer rankSource) {
+		this.rankSource = rankSource;
+	}
+
+	public Integer getRankOrderNum() {
+		return rankOrderNum;
+	}
+
+	public void setRankOrderNum(Integer rankOrderNum) {
+		this.rankOrderNum = rankOrderNum;
+	}
+
+	public String getInviteCode() {
+		return inviteCode;
+	}
+
+	public void setInviteCode(String inviteCode) {
+		this.inviteCode = inviteCode;
+	}
+
+	public Integer getCouponNews() {
+		return couponNews;
+	}
+
+	public void setCouponNews(Integer couponNews) {
+		this.couponNews = couponNews;
+	}
+
+	public Date getFirstLoginTime() {
+		return firstLoginTime;
+	}
+
+	public void setFirstLoginTime(Date firstLoginTime) {
+		this.firstLoginTime = firstLoginTime;
+	}
+
+	public Boolean getSynchNavbar() {
+		return synchNavbar;
+	}
+
+	public void setSynchNavbar(Boolean synchNavbar) {
+		this.synchNavbar = synchNavbar;
+	}
+
+	public Integer getSex() {
+		return sex;
+	}
+
+	public void setSex(Integer sex) {
+		this.sex = sex;
+	}
+
+	public String getWeiXin() {
+		return weiXin;
+	}
+
+	public void setWeiXin(String weiXin) {
+		this.weiXin = weiXin;
+	}
+
+	public Integer getGoldCoin() {
+		return goldCoin;
+	}
+
+	public void setGoldCoin(Integer goldCoin) {
+		this.goldCoin = goldCoin;
+	}
+
+	public String getMark() {
+		return mark;
+	}
+
+	public void setMark(String mark) {
+		this.mark = mark;
+	}
+
+	public Date getActiveTime() {
+		return activeTime;
+	}
+
+	public void setActiveTime(Date activeTime) {
+		this.activeTime = activeTime;
+	}
+
+	public String getInviteCodeVip() {
+		return inviteCodeVip;
+	}
+
+	public void setInviteCodeVip(String inviteCodeVip) {
+		this.inviteCodeVip = inviteCodeVip;
+	}
+
+	public String getErCode() {
+		return erCode;
+	}
+
+	public void setErCode(String erCode) {
+		this.erCode = erCode;
+	}
+
+	public Date getRankUpdateTime() {
+		return rankUpdateTime;
+	}
+
+	public void setRankUpdateTime(Date rankUpdateTime) {
+		this.rankUpdateTime = rankUpdateTime;
+	}
+
+	public Boolean getBindTaoBao() {
+		return bindTaoBao;
+	}
+
+	public void setBindTaoBao(Boolean bindTaoBao) {
+		this.bindTaoBao = bindTaoBao;
+	}
+
+}

--
Gitblit v1.8.0