From cb16cabb64e99d7f505822a49665725ff5b61ff6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 15 八月 2022 15:37:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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..f9efeee 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;
@@ -15,17 +15,17 @@
private double latitude;
private String streamType;
private boolean status;
- /**
- * GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
- */
- public Long createStamp;
- public int getId() {
- return id;
+ public String createTime;
+
+ @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() {
@@ -100,12 +100,11 @@
this.mediaServerId = mediaServerId;
}
-
- public Long getCreateStamp() {
- return createStamp;
+ public String getCreateTime() {
+ return createTime;
}
- public void setCreateStamp(Long createStamp) {
- this.createStamp = createStamp;
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
}
}
--
Gitblit v1.8.0