From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java |   98 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 97 insertions(+), 1 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 2e3eb36..3058659 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
@@ -40,7 +40,39 @@
 	@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_create_time")
 	private Date createTime;
@@ -48,6 +80,7 @@
 	// 鏇存柊鏃堕棿
 	@Column(name = "uie_update_time")
 	private Date updateTime;
+	
 
 	public Long getId() {
 		return id;
@@ -112,5 +145,68 @@
 	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;
+	}
 }

--
Gitblit v1.8.0