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/CatalogData.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
index 338f8ad..8a96d35 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
@@ -1,13 +1,13 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Date;
+import java.time.Instant;
import java.util.List;
public class CatalogData {
private int sn; // 鍛戒护搴忓垪鍙�
private int total;
private List<DeviceChannel> channelList;
- private Date lastTime;
+ private Instant lastTime;
private Device device;
private String errorMsg;
@@ -41,11 +41,11 @@
this.channelList = channelList;
}
- public Date getLastTime() {
+ public Instant getLastTime() {
return lastTime;
}
- public void setLastTime(Date lastTime) {
+ public void setLastTime(Instant lastTime) {
this.lastTime = lastTime;
}
--
Gitblit v1.8.0