From 491286095ccd5b6bfd74190eda66f39c33428abf Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期三, 18 五月 2022 14:40:32 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java | 18 +++++++++---------
1 files changed, 9 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
index b4a0289..950a8ca 100644
--- 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,7 @@
private String password;
private String createTime;
private String updateTime;
- private int roleId;
+ private Role role;
public int getId() {
return id;
@@ -41,14 +41,6 @@
this.createTime = createTime;
}
- public int getRoleId() {
- return roleId;
- }
-
- public void setRoleId(int roleId) {
- this.roleId = roleId;
- }
-
public String getUpdateTime() {
return updateTime;
}
@@ -56,4 +48,12 @@
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
+
+ public Role getRole() {
+ return role;
+ }
+
+ public void setRole(Role role) {
+ this.role = role;
+ }
}
--
Gitblit v1.8.0