From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
index 6cee96e..519169e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java
@@ -40,11 +40,6 @@
* 密码
*/
private String password;
- /**
- * 密码修改时间
- */
- @TableField("passWordUpdate")
- private Date passWordUpdate;
/**
* md5密码盐
*/
@@ -90,30 +85,24 @@
*/
private Integer version;
/**
- * 角色类型 1=平台 2=分公司 3=加盟商
+ * 对象类型（1=平台，2=城市管理员，3=门店）
*/
- @TableField("roleType")
- private Integer roleType;
+ @TableField("objectType")
+ private Integer objectType;
/**
- * 对象ID
+ * objectId
*/
@TableField("objectId")
private Integer objectId;
+ @TableField("idCard")
+ private String idCard;
- public Integer getRoleType() {
- return roleType;
+ public String getIdCard() {
+ return idCard;
}
- public void setRoleType(Integer roleType) {
- this.roleType = roleType;
- }
-
- public Integer getObjectId() {
- return objectId;
- }
-
- public void setObjectId(Integer objectId) {
- this.objectId = objectId;
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
}
public Integer getId() {
@@ -144,13 +133,6 @@
return password;
}
- public Date getPassWordUpdate() {
- return passWordUpdate;
- }
-
- public void setPassWordUpdate(Date passWordUpdate) {
- this.passWordUpdate = passWordUpdate;
- }
public void setPassword(String password) {
this.password = password;
@@ -244,6 +226,22 @@
this.version = version;
}
+ public Integer getObjectType() {
+ return objectType;
+ }
+
+ public void setObjectType(Integer objectType) {
+ this.objectType = objectType;
+ }
+
+ public Integer getObjectId() {
+ return objectId;
+ }
+
+ public void setObjectId(Integer objectId) {
+ this.objectId = objectId;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1