From 1e105fb6e1b44af3dd6d3f09ee4e7011f3e055a7 Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期三, 22 六月 2022 13:38:25 +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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 697df04..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
@@ -6,7 +6,8 @@
private String username;
private String password;
private String createTime;
- private int roleId;
+ private String updateTime;
+ private Role role;
public int getId() {
return id;
@@ -40,11 +41,19 @@
this.createTime = createTime;
}
- public int getRoleId() {
- return roleId;
+ public String getUpdateTime() {
+ return updateTime;
}
- public void setRoleId(int roleId) {
- this.roleId = roleId;
+ 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