From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 27d808e..9aff155 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -177,7 +177,7 @@
         });
 
         //5���������������
-        String insertTimeUnits = DateUtils.dateToDateString(now, DateUtils.yyyyMM_EN);
+        String insertTimeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
         //���������������
         historyFiveMinutelyMapper.insertHistoryFiveMinutely(insertData, insertTimeUnits);
     }

--
Gitblit v1.8.0