From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 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 6cb6db0..7c374c0 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,11 +9,15 @@
/**
* 鐢ㄦ埛闄勫姞淇℃伅
+ *
* @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;
@@ -22,7 +26,7 @@
@Expose
@Column(name = "uie_uid")
private UserInfo userInfo;
-
+
// 绛夌骇id
@Expose
@Column(name = "uie_rank_id")
@@ -31,16 +35,16 @@
// 绛夌骇鏉ユ簮锛氳繑鍒┿�佸垎浜�侀個璇�
@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;
@@ -56,15 +60,15 @@
// 鏄惁鍚屾瀵艰埅鏍�
@Column(name = "uie_synch_navbar")
private Boolean synchNavbar;
-
+
// 棣栨鐧诲綍鏃堕棿
@Column(name = "uie_first_login_time")
private Date firstLoginTime;
-
- // 鎬у埆: 1-濂� 2-鐢�
+
+ // 鎬у埆: 1-濂� 2-鐢�
@Column(name = "uie_sex")
private Integer sex;
-
+
// 寰俊鍙�
@Column(name = "uie_weixin")
private String weiXin;
@@ -72,23 +76,27 @@
// 閲戝竵鏁伴噺
@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;
-
+ private Date closeTimeExtract;
+
// 鐢ㄦ埛鏍囪瘑
@Column(name = "uie_mark")
- private String mark;
-
+ private String mark;
+
// 鐢ㄦ埛鏈�杩戞椿璺冩椂闂�
@Column(name = "uie_active_time")
- private Date activeTime;
-
+ private Date activeTime;
+
+ // 閭�璇风爜鐘舵��
+ @Column(name = "uie_invite_code_state")
+ private Integer inviteCodeState;// 0-鏃犳晥 1-鏈慨鏀规湁鏁� 2-淇敼鏈夋晥
+
// 鍒涘缓鏃堕棿
@Column(name = "uie_create_time")
private Date createTime;
@@ -96,7 +104,6 @@
// 鏇存柊鏃堕棿
@Column(name = "uie_update_time")
private Date updateTime;
-
public Long getId() {
return id;
@@ -225,7 +232,6 @@
public void setGoldCoin(Integer goldCoin) {
this.goldCoin = goldCoin;
}
-
public Boolean getAutoExtract() {
return autoExtract;
@@ -258,5 +264,13 @@
public void setActiveTime(Date activeTime) {
this.activeTime = activeTime;
}
-
+
+ public Integer getInviteCodeState() {
+ return inviteCodeState;
+ }
+
+ public void setInviteCodeState(Integer inviteCodeState) {
+ this.inviteCodeState = inviteCodeState;
+ }
+
}
--
Gitblit v1.8.0