From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java
index a4871ae..f425dfa 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java
@@ -1,24 +1,16 @@
package com.genersoft.iot.vmp.gb28181.bean;
public class PlatformGbStream {
- private String app;
- private String stream;
+ private Integer gbStreamId;
private String platformId;
+ private String catalogId;
- public String getApp() {
- return app;
+ public Integer getGbStreamId() {
+ return gbStreamId;
}
- public void setApp(String app) {
- this.app = app;
- }
-
- public String getStream() {
- return stream;
- }
-
- public void setStream(String stream) {
- this.stream = stream;
+ public void setGbStreamId(Integer gbStreamId) {
+ this.gbStreamId = gbStreamId;
}
public String getPlatformId() {
@@ -28,4 +20,12 @@
public void setPlatformId(String platformId) {
this.platformId = platformId;
}
+
+ public String getCatalogId() {
+ return catalogId;
+ }
+
+ public void setCatalogId(String catalogId) {
+ this.catalogId = catalogId;
+ }
}
--
Gitblit v1.8.0