From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 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 93dc956..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
@@ -40,4 +40,11 @@
     //���������������������������������������������������������������
     void insertHistoryHourlyComplete();
 
+
+    void dateToChangShu(String time);
+
+    //������������������������������
+    void dateInsertHistoryHourlyAvg();
+
+
 }

--
Gitblit v1.8.0