From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java | 154 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 149 insertions(+), 5 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 fc550f9..1ee036c 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
@@ -9,6 +9,7 @@
/**
* 鐢ㄦ埛闄勫姞淇℃伅
+ *
* @author Administrator
*
*/
@@ -22,7 +23,7 @@
@Expose
@Column(name = "uie_uid")
private UserInfo userInfo;
-
+
// 绛夌骇id
@Expose
@Column(name = "uie_rank_id")
@@ -31,24 +32,71 @@
// 绛夌骇鏉ユ簮锛氳繑鍒┿�佸垎浜�侀個璇�
@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_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_ercode")
+ private String erCode;
// 鍒涘缓鏃堕棿
@Column(name = "uie_create_time")
@@ -137,5 +185,101 @@
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 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;
+ }
+
}
--
Gitblit v1.8.0