From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 18 Dec 2023 13:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

---
 screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java |    6 ++++++
 1 files changed, 6 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 4c248b4..a67b9b6 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
@@ -43,5 +43,11 @@
 
     void dateToChangShu(String time);
 
+    //������������������������������
+    void dateInsertHistoryHourlyAvg();
+
+    //���������������������������������
+    void dateInsertHistoryHourlyJKAvg(String start,String end);
+
 
 }

--
Gitblit v1.8.0