From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
index 37e636b..010e000 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
@@ -5,6 +5,7 @@
*/
public class GbStream extends PlatformGbStream{
+ private Integer gbStreamId;
private String app;
private String stream;
private String gbId;
@@ -19,6 +20,16 @@
*/
public Long createStamp;
+ @Override
+ public Integer getGbStreamId() {
+ return gbStreamId;
+ }
+
+ @Override
+ public void setGbStreamId(Integer gbStreamId) {
+ this.gbStreamId = gbStreamId;
+ }
+
public String getApp() {
return app;
}
--
Gitblit v1.8.0