From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java |   10 ++++++++++
 1 files changed, 10 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..b65b3d3 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,14 @@
      */
     List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate);
 
+    //���������������������������������������������������������������
+    void insertHistoryHourlyComplete();
+
+
+    void dateToChangShu(String time);
+
+    //������������������������������
+    void dateInsertHistoryHourlyAvg();
+
+
 }

--
Gitblit v1.8.0