From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/user/model/User.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 8e7b836..d023341 100644
--- a/src/main/java/com/qxueyou/scc/user/model/User.java
+++ b/src/main/java/com/qxueyou/scc/user/model/User.java
@@ -38,6 +38,19 @@
@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;
+ }
+
/**
* 鍒涘缓鏃堕棿
*/
@@ -144,6 +157,20 @@
@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