|
|
@@ -2,6 +2,7 @@ package com.uas.sso.entity;
|
|
|
|
|
|
import com.alibaba.fastjson.annotation.JSONField;
|
|
|
import java.io.Serializable;
|
|
|
+import java.sql.Time;
|
|
|
import java.sql.Timestamp;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
@@ -36,19 +37,19 @@ public class User implements Serializable {
|
|
|
/**
|
|
|
* 会员名
|
|
|
*/
|
|
|
- @Column(name = "vip_name", nullable = false)
|
|
|
+ @Column(name = "vip_name", nullable = false, length = 100)
|
|
|
private String vipName;
|
|
|
|
|
|
/**
|
|
|
* 手机号
|
|
|
*/
|
|
|
- @Column(name = "mobile", unique = true, nullable = false)
|
|
|
+ @Column(name = "mobile", unique = true, nullable = false, length = 11)
|
|
|
private String mobile;
|
|
|
|
|
|
/**
|
|
|
* 手机号所属区域(continent or Hongkong)
|
|
|
*/
|
|
|
- @Column(name = "mobile_area")
|
|
|
+ @Column(name = "mobile_area", length = 30)
|
|
|
private String mobileArea;
|
|
|
|
|
|
/**
|
|
|
@@ -139,7 +140,7 @@ public class User implements Serializable {
|
|
|
* 出生日期
|
|
|
*/
|
|
|
@Column(name = "birthday")
|
|
|
- private String birthday;
|
|
|
+ private Timestamp birthday;
|
|
|
|
|
|
/**
|
|
|
* 微信号(微信扫码授权或微信客户端授权,不用出现在注册页面,预留)
|
|
|
@@ -156,38 +157,38 @@ public class User implements Serializable {
|
|
|
/**
|
|
|
* 国籍(不用出现在注册页面,预留)
|
|
|
*/
|
|
|
- @Column(name = "nationality")
|
|
|
+ @Column(name = "nationality", length = 50)
|
|
|
private String nationality;
|
|
|
|
|
|
/**
|
|
|
* 籍贯(不用出现在注册页面,预留)
|
|
|
*/
|
|
|
- @Column(name = "native_place")
|
|
|
+ @Column(name = "native_place", length = 50)
|
|
|
private String nativePlace;
|
|
|
|
|
|
/**
|
|
|
* 现在所在国家(不用出现在注册页面,预留)
|
|
|
*/
|
|
|
- @Column(name = "user_country")
|
|
|
+ @Column(name = "user_country", length = 50)
|
|
|
private String country;
|
|
|
|
|
|
/**
|
|
|
* 现在所在省份、州、直辖市、行政区(不用出现在注册页面,预留)
|
|
|
*/
|
|
|
- @Column(name = "user_province")
|
|
|
+ @Column(name = "user_province", length = 50)
|
|
|
private String province;
|
|
|
|
|
|
/**
|
|
|
* 现在所在城市(不用出现在注册页面,预留)
|
|
|
*/
|
|
|
- @Column(name = "user_city")
|
|
|
+ @Column(name = "user_city", length = 50)
|
|
|
private String city;
|
|
|
|
|
|
/**
|
|
|
* 账户是否冻结(1、冻结)
|
|
|
*/
|
|
|
@Column(name = "_lock")
|
|
|
- private Integer lock;
|
|
|
+ private Short lock;
|
|
|
|
|
|
/**
|
|
|
* imId
|
|
|
@@ -371,11 +372,11 @@ public class User implements Serializable {
|
|
|
this.sex = sex;
|
|
|
}
|
|
|
|
|
|
- public String getBirthday() {
|
|
|
+ public Timestamp getBirthday() {
|
|
|
return birthday;
|
|
|
}
|
|
|
|
|
|
- public void setBirthday(String birthday) {
|
|
|
+ public void setBirthday(Timestamp birthday) {
|
|
|
this.birthday = birthday;
|
|
|
}
|
|
|
|
|
|
@@ -435,11 +436,11 @@ public class User implements Serializable {
|
|
|
this.city = city;
|
|
|
}
|
|
|
|
|
|
- public Integer getLock() {
|
|
|
+ public Short getLock() {
|
|
|
return lock;
|
|
|
}
|
|
|
|
|
|
- public void setLock(Integer lock) {
|
|
|
+ public void setLock(Short lock) {
|
|
|
this.lock = lock;
|
|
|
}
|
|
|
|
|
|
@@ -493,7 +494,7 @@ public class User implements Serializable {
|
|
|
userView.setRealName(this.getRealName());
|
|
|
userView.setIdCard(this.getIdCard());
|
|
|
userView.setIdentityValidCode(this.getIdentityValidCode());
|
|
|
- userView.setLock(this.getLock());
|
|
|
+ userView.setLock(Integer.valueOf(this.getLock()));
|
|
|
userView.setImId(this.getImId());
|
|
|
userView.setPassword(this.getPassword());
|
|
|
return userView;
|