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/GbStream.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 21b46d8..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,7 +5,7 @@
*/
public class GbStream extends PlatformGbStream{
- private int id;
+ private Integer gbStreamId;
private String app;
private String stream;
private String gbId;
@@ -20,12 +20,14 @@
*/
public Long createStamp;
- public int getId() {
- return id;
+ @Override
+ public Integer getGbStreamId() {
+ return gbStreamId;
}
- public void setId(int id) {
- this.id = id;
+ @Override
+ public void setGbStreamId(Integer gbStreamId) {
+ this.gbStreamId = gbStreamId;
}
public String getApp() {
--
Gitblit v1.8.0