From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑

---
 src/main/java/com/qxueyou/scc/user/model/User.java |   65 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/user/model/User.java b/src/main/java/com/qxueyou/scc/user/model/User.java
index e9dbfd4..d023341 100644
--- a/src/main/java/com/qxueyou/scc/user/model/User.java
+++ b/src/main/java/com/qxueyou/scc/user/model/User.java
@@ -11,7 +11,7 @@
 
 
 /**
- * 用户表 实体
+ * 鐢ㄦ埛琛� 瀹炰綋
  *
  * @author ody.yuan
  */
@@ -23,7 +23,7 @@
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * 涓婚敭
      */
     @Id
     @GeneratedValue(generator = "hibernate-uuid")
@@ -32,14 +32,27 @@
     private String userId;
 
     /**
-     * 创建者ID
+     * 鍒涘缓鑰匢D
      */
     @Column(name = "CREATE_ID", nullable = false, length = 32)
     @JsonIgnore
     private String createId;
 
+
+    @Column(name = "SALT", nullable = false, length = 200)
+    @JsonIgnore
+    private String salt;
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
     /**
-     * 创建时间
+     * 鍒涘缓鏃堕棿
      */
     @Column(name = "CREATE_TIME", nullable = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -47,76 +60,76 @@
     private Date createTime;
 
     /**
-     * 创建人
+     * 鍒涘缓浜�
      */
     @Column(name = "CREATOR", nullable = false, length = 100)
     @JsonIgnore
     private String creator;
 
     /**
-     * 删除标志
+     * 鍒犻櫎鏍囧織
      */
     @Column(name = "DELETE_FLAG", nullable = false)
     @JsonIgnore
     private boolean deleteFlag;
 
     /**
-     * 用户头像路径
+     * 鐢ㄦ埛澶村儚璺緞
      */
     @Column(name = "IMG_PATH", length = 255)
     private String imgPath;
 
     /**
-     * 手机号
+     * 鎵嬫満鍙�
      */
     @Column(name = "MOBILE_PHONE", length = 15)
     private String mobilePhone;
 
     /**
-     * 来源
+     * 鏉ユ簮
      */
     @Column(name = "SOURCE", length = 16)
     private String source;
 
     /**
-     * 邮箱
+     * 閭
      */
     @Column(name = "E_MAIL", length = 64)
     private String email;
 
     /**
-     * 微博号
+     * 寰崥鍙�
      */
     @Column(name = "AGE")
     private Integer age;
 
     /**
-     * 姓名
+     * 濮撳悕
      */
     @Column(name = "NAME", length = 150)
     private String name;
 
     /**
-     * 登录账号
+     * 鐧诲綍璐﹀彿
      */
     @Column(name = "ACCOUNT", length = 64)
     private String account;
 
     /**
-     * 密码
+     * 瀵嗙爜
      */
     @Column(name = "PASSWORD", length = 255)
     private String password;
 
     /**
-     * 修改人ID
+     * 淇敼浜篒D
      */
     @Column(name = "UPDATE_ID", length = 32)
     @JsonIgnore
     private String updateId;
 
     /**
-     * 修改时间
+     * 淇敼鏃堕棿
      */
     @Column(name = "UPDATE_TIME", nullable = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -124,7 +137,7 @@
     private Date updateTime;
 
     /**
-     * 修改人
+     * 淇敼浜�
      */
     @Column(name = "UPDATOR", length = 100)
     @JsonIgnore
@@ -132,18 +145,32 @@
 
 
     /**
-     * 性别
+     * 鎬у埆
      */
     @Column(name = "SEX")
     private boolean sex;
 
 
     /**
-     * 绑定账号ID
+     * 缁戝畾璐﹀彿ID
      */
     @Column(name = "IMEI", length = 255)
     private String imei;
 
+    /**
+     * 缁戝畾璐﹀彿ID
+     */
+    @Column(name = "OPENID", length = 255)
+    private String openId;
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
     @ManyToMany(fetch = FetchType.LAZY, mappedBy = "users")
     @JsonIgnore
     private List<UserRole> roles;

--
Gitblit v1.8.0