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 |    3 +++
 1 files changed, 3 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 b65b3d3..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
@@ -46,5 +46,8 @@
     //������������������������������
     void dateInsertHistoryHourlyAvg();
 
+    //���������������������������������
+    void dateInsertHistoryHourlyJKAvg(String start,String end);
+
 
 }

--
Gitblit v1.8.0