From 44251a92dc85a93eff59704b40b07830bde8d16f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:38:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 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