From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:50 +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/UserInfo.java | 62 ++++++++++---------------------
1 files changed, 20 insertions(+), 42 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 3e6b129..f1c728a 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
@@ -3,12 +3,11 @@
import java.math.BigDecimal;
import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.Table;
import javax.persistence.Transient;
+
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -19,94 +18,78 @@
* @author Administrator
*
*/
-@Entity
-@Table(name = "`yeshi_ec_user`")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_user")
+@Table("yeshi_ec_user")
public class UserInfo {
public static int STATE_NORMAL = 0;// 姝ｅ父鐘舵��
public static int STATE_DELETE = 1;// 鍒犻櫎鐘舵��
public static int STATE_FORBIDDEN = 2;// 灏佺鐘舵��
public static int STATE_DELETE_OUT_OF_DATE = 4;// 鐢ㄦ埛闀挎湡涓嶆椿璺冭鍒犻櫎
- @Id
- // @GeneratedValue(strategy = GenerationType.SEQUENCE)
@Column(name = "id")
- @org.yeshi.utils.mybatis.Column(name = "id")
@Expose
private Long id;
/**
* 娣樺疂openId
*/
@Expose
- @Column(name = "identifycode", length = 128)
- @org.yeshi.utils.mybatis.Column(name = "identifycode")
+ @Column(name = "identifycode")
private String openid;
@Column(name = "login_type")
- @org.yeshi.utils.mybatis.Column(name = "login_type")
@Expose
private Integer loginType;// 1-娣樺疂
@Column(name = "wx_open_id")
- @org.yeshi.utils.mybatis.Column(name = "wx_open_id")
@Expose
private String wxOpenId;
@Column(name = "wx_union_id")
- @org.yeshi.utils.mybatis.Column(name = "wx_union_id")
@Expose
private String wxUnionId;
- @org.yeshi.utils.mybatis.Column(name = "nick_name")
- @Column(name = "nick_name", length = 128)
+ @Column(name = "nick_name")
@Expose
private String nickName;// 鏄电О
- @org.yeshi.utils.mybatis.Column(name = "tbName")
+ @Column(name = "tbName")
@Expose
private String tbName; // 娣樺疂鏄电О
- @org.yeshi.utils.mybatis.Column(name = "tbPic")
+ @Column(name = "tbPic")
private String tbPic;// 娣樺疂澶村儚
- @org.yeshi.utils.mybatis.Column(name = "wxName")
+ @Column(name = "wxName")
@Expose
private String wxName;
- @org.yeshi.utils.mybatis.Column(name = "wxPic")
+ @Column(name = "wxPic")
private String wxPic;
- @org.yeshi.utils.mybatis.Column(name = "portrait")
- @Column(name = "portrait", length = 512)
+ @Column(name = "portrait")
@Expose
private String portrait;// 澶村儚
- @org.yeshi.utils.mybatis.Column(name = "createtime")
+ @Column(name = "createtime")
@Expose
private Long createtime;
- @org.yeshi.utils.mybatis.Column(name = "last_logintime")
@Column(name = "last_logintime")
@Expose
private Long lastLoginTime;// 鏈�杩戜竴娆＄櫥褰曟椂闂�
- @org.yeshi.utils.mybatis.Column(name = "loginip")
- @Column(name = "loginip", length = 30)
+ @Column(name = "loginip")
@Expose
private String lastLoginIp;// 鏈�杩戜竴娆＄櫥褰旾P
- @org.yeshi.utils.mybatis.Column(name = "tuiguang_code")
- @Column(name = "tuiguang_code", length = 30)
+ @Column(name = "tuiguang_code")
@Expose
private String tuiGuangCode;// 鎺ㄥ箍鐮�
- @org.yeshi.utils.mybatis.Column(name = "appid")
- @Column(name = "appid", length = 30)
+ @Column(name = "appid")
@Expose
private String appId;//
- @org.yeshi.utils.mybatis.Column(name = "my_hongBao")
- @Column(name = "my_hongBao", length = 8)
+ @Column(name = "my_hongBao")
@Expose
// @Type(type = "big_decimal")
private BigDecimal myHongBao; // 鎴戠殑绾㈠寘
@@ -121,29 +104,24 @@
@Expose
private BigDecimal canOpenHongBao;
- @org.yeshi.utils.mybatis.Column(name = "pay_password")
@Column(name = "pay_password")
private String payPassword;
- @org.yeshi.utils.mybatis.Column(name = "sid")
- @ManyToOne
- @JoinColumn(name = "sid")
+ @Column(name = "sid")
private BusinessSystem system;
- @org.yeshi.utils.mybatis.Column(name = "rank")
+ @Column(name = "rank")
@Expose
private Integer rank;// 0 鏅�� 1 閾� 2閾� 3 閲�
- @org.yeshi.utils.mybatis.Column(name = "phone")
- @Column(name = "phone", length = 16)
+ @Column(name = "phone")
@Expose
private String phone; // 鐢佃瘽鍙风爜
- @org.yeshi.utils.mybatis.Column(name = "state")
+ @Column(name = "state")
private Integer state; // 鐢ㄦ埛鐨勭姸鎬�
- @org.yeshi.utils.mybatis.Column(name = "state_desc")
- @Column(name = "state_desc") // 鐢ㄦ埛鐘舵�佺畝浠�
+ @Column(name = "state_desc")
private String stateDesc;
@Transient
--
Gitblit v1.8.0