From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java
old mode 100644
new mode 100755
index b4a0289..c9b4002
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java
@@ -7,7 +7,8 @@
private String password;
private String createTime;
private String updateTime;
- private int roleId;
+ private String pushKey;
+ private Role role;
public int getId() {
return id;
@@ -41,14 +42,6 @@
this.createTime = createTime;
}
- public int getRoleId() {
- return roleId;
- }
-
- public void setRoleId(int roleId) {
- this.roleId = roleId;
- }
-
public String getUpdateTime() {
return updateTime;
}
@@ -56,4 +49,20 @@
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
+
+ public Role getRole() {
+ return role;
+ }
+
+ public void setRole(Role role) {
+ this.role = role;
+ }
+
+ public String getPushKey() {
+ return pushKey;
+ }
+
+ public void setPushKey(String pushKey) {
+ this.pushKey = pushKey;
+ }
}
--
Gitblit v1.8.0