From 3dc1e0368e63a40131afb10ab0c7e26f651d220b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 04 三月 2022 15:59:29 +0800
Subject: [PATCH] 修复合并分支造成的bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 96fcd36..0c06145 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -104,6 +104,16 @@
*/
private int channelCount;
+ /**
+ * 鍏变韩鎵�鏈夌殑鐩存挱娴�
+ */
+ private boolean shareAllLiveStream;
+
+ /**
+ * 榛樿鐩綍Id,鑷姩娣诲姞鐨勯�氶亾澶氭斁鍦ㄨ繖涓洰褰曚笅
+ */
+ private String catalogId;
+
public Integer getId() {
return id;
}
@@ -264,4 +274,20 @@
this.channelCount = channelCount;
}
+
+ public boolean isShareAllLiveStream() {
+ return shareAllLiveStream;
+ }
+
+ public void setShareAllLiveStream(boolean shareAllLiveStream) {
+ this.shareAllLiveStream = shareAllLiveStream;
+ }
+
+ public String getCatalogId() {
+ return catalogId;
+ }
+
+ public void setCatalogId(String catalogId) {
+ this.catalogId = catalogId;
+ }
}
--
Gitblit v1.8.0