From 817fc86c3cd7026064a6e3ba0ca5a5b61fc68546 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期六, 16 五月 2020 14:51:45 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/swwheihei/wvp.git
---
src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java
index 5950d17..fb22948 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/DateUtil.java
@@ -46,7 +46,7 @@
Date date;
try {
date = format.parse(formatTime);
- Long timestamp=date.getTime();
+ Long timestamp=date.getTime()/1000;
//杞崲涓篋ate绫�
return timestamp;
} catch (ParseException e) {
--
Gitblit v1.8.0