From 5e724cc0628554b949f0102bee6294db8a23c7f5 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期三, 06 七月 2022 15:33:43 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 1b77dde..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
@@ -15,16 +15,15 @@
private double latitude;
private String streamType;
private boolean status;
- /**
- * GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
- */
- public Long createStamp;
+
+ public String createTime;
@Override
public Integer getGbStreamId() {
return gbStreamId;
}
+ @Override
public void setGbStreamId(Integer gbStreamId) {
this.gbStreamId = gbStreamId;
}
@@ -101,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