From e861c9dfab7d74444593b3cfa866544d648dca7f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 22 二月 2022 11:55:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-pro-record
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java
index c035b80..e343fec 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEvent.java
@@ -20,7 +20,7 @@
public static final String UPDATE = "UPDATE"; // 鏇存柊
private List<DeviceChannel> deviceChannels;
- private List<GbStream> gbStreams;
+ private GbStream[] gbStreams;
private String type;
private String platformId;
@@ -48,11 +48,11 @@
this.platformId = platformId;
}
- public List<GbStream> getGbStreams() {
+ public GbStream[] getGbStreams() {
return gbStreams;
}
- public void setGbStreams(List<GbStream> gbStreams) {
+ public void setGbStreams(GbStream[] gbStreams) {
this.gbStreams = gbStreams;
}
}
--
Gitblit v1.8.0