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/gb28181/bean/ParentPlatform.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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
old mode 100644
new mode 100755
index 00a16f9..1638c71
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -53,7 +53,7 @@
/**
* 璁惧鍥芥爣缂栧彿
*/
- @Schema(description = "11111")
+ @Schema(description = "璁惧鍥芥爣缂栧彿")
private String deviceGBId;
/**
@@ -113,7 +113,6 @@
/**
* RTCP娴佷繚娲�
- * TODO 棰勭暀, 鏆備笉瀹炵幇
*/
@Schema(description = "RTCP娴佷繚娲�")
private boolean rtcp;
@@ -184,11 +183,11 @@
@Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
- /**
- * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
- */
- @Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGrou")
- private String treeType;
+ @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+ private boolean asMessageChannel;
+
+ @Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
+ private boolean autoPushChannel;
public Integer getId() {
return id;
@@ -422,11 +421,19 @@
this.createTime = createTime;
}
- public String getTreeType() {
- return treeType;
+ public boolean isAsMessageChannel() {
+ return asMessageChannel;
}
- public void setTreeType(String treeType) {
- this.treeType = treeType;
+ public void setAsMessageChannel(boolean asMessageChannel) {
+ this.asMessageChannel = asMessageChannel;
+ }
+
+ public boolean isAutoPushChannel() {
+ return autoPushChannel;
+ }
+
+ public void setAutoPushChannel(boolean autoPushChannel) {
+ this.autoPushChannel = autoPushChannel;
}
}
--
Gitblit v1.8.0