From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 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 5f9d59f..4469f15 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
@@ -45,6 +45,22 @@
 	@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;
+
 	// 鍒涘缓鏃堕棿
 	@Column(name = "uie_create_time")
 	private Date createTime;
@@ -52,6 +68,7 @@
 	// 鏇存柊鏃堕棿
 	@Column(name = "uie_update_time")
 	private Date updateTime;
+	
 
 	public Long getId() {
 		return id;
@@ -124,5 +141,37 @@
 	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;
+	}
 	
 }

--
Gitblit v1.8.0