From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java
index a13dc79..4c248b4 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -37,4 +37,11 @@
*/
List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate);
+ //���������������������������������������������������������������
+ void insertHistoryHourlyComplete();
+
+
+ void dateToChangShu(String time);
+
+
}
--
Gitblit v1.8.0