From fdef922f0f8adea77cfaee8194033b2947575fd2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:32:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 71646df..8643c9a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -57,7 +57,6 @@
         String format1 = dateFormat.format(l);
         Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
 
-
 //        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
         String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
 

--
Gitblit v1.8.0