From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期一, 24 七月 2023 14:10:46 +0800
Subject: [PATCH] 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
---
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
index b4a0289..c9b4002 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,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