From addedb6e27a0eff756ff3cabdd7dd2295ade5414 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 14:41:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 671af4f..3853749 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -366,7 +366,7 @@
wrapper.select("value,mac,time,organization_id");
wrapper.orderByAsc("time");
List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
- Date time =DateUtils.addDays(datas.get(2).getTime(),0);
+ Date time = new Date();
//String bat = "2023-08-08 14:42:20";
for(HistorySecondUav g : datas){
HistorySecondUav historySecondUav = new HistorySecondUav();
--
Gitblit v1.8.0