From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
index 52e5809..1b855f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.bus.user;
+import java.io.Serializable;
import java.math.BigDecimal;
import javax.persistence.Column;
@@ -17,7 +18,10 @@
*
*/
@Table("yeshi_ec_user")
-public class UserInfo {
+public class UserInfo implements Serializable{
+ /**
+ *
+ */
public static int STATE_NORMAL = 0;// 姝ｅ父鐘舵��
public static int STATE_DELETE = 1;// 鍒犻櫎鐘舵��
public static int STATE_FORBIDDEN = 2;// 灏佺鐘舵��
@@ -79,9 +83,9 @@
@Expose
private String lastLoginIp;// 鏈�杩戜竴娆＄櫥褰旾P
- @Column(name = "tuiguang_code")
+ @Column(name = "type")
@Expose
- private String tuiGuangCode;// 鎺ㄥ箍鐮�
+ private Integer type;// 鐢ㄦ埛绫诲瀷 0-鏅�氱敤鎴� 1-铏氭嫙鐢ㄦ埛
@Column(name = "appid")
@Expose
@@ -121,22 +125,37 @@
@Column(name = "state_desc")
private String stateDesc;
+
+ @Column(name = "platform")
+ private String platform;//鏉ユ簮骞冲彴
+
+ public String getPlatform() {
+ return platform;
+ }
+
+ public void setPlatform(String platform) {
+ this.platform = platform;
+ }
@Transient
@Expose
private String rankIcon;// 绛夌骇鍥炬爣
-
- // 鎬у埆: 1-濂� 2-鐢�
+ // 鎬у埆: 1-濂� 2-鐢�
@Transient
@Expose
private Integer sex;
-
+
// 寰俊鍙�
@Transient
@Expose
private String weiXin;
+ // 浜岀淮鐮�
+ @Transient
+ @Expose
+ private String erCode;
+
// 寰俊鎻愮ず璇�
@Transient
@Expose
@@ -147,7 +166,20 @@
private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
@Transient
private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
-
+
+ // 鏄惁涓篤IP
+ @Transient
+ @Expose
+ private boolean vip;
+
+ public boolean isVip() {
+ return vip;
+ }
+
+ public void setVip(boolean vip) {
+ this.vip = vip;
+ }
+
public String getTaoBaoUid() {
return taoBaoUid;
}
@@ -279,14 +311,6 @@
this.appId = appId;
}
- public String getTuiGuangCode() {
- return tuiGuangCode;
- }
-
- public void setTuiGuangCode(String tuiGuangCode) {
- this.tuiGuangCode = tuiGuangCode;
- }
-
public Long getId() {
return id;
}
@@ -398,7 +422,7 @@
public void setPayPassword(String payPassword) {
this.payPassword = payPassword;
}
-
+
public Integer getSex() {
return sex;
}
@@ -423,6 +447,22 @@
this.weiXinTip = weiXinTip;
}
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getErCode() {
+ return erCode;
+ }
+
+ public void setErCode(String erCode) {
+ this.erCode = erCode;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
--
Gitblit v1.8.0