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/task/HistoryTableInsertTask.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java b/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
index 712369f..05cbeb5 100644
--- a/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java
@@ -132,7 +132,7 @@
 
     //������������������������������
     @XxlJob("dateInsertHistoryHourlyJKAvg")
-    public ReturnT dateInsertJKAvg(){
+    public ReturnT dateInsertHistoryHourlyJKAvg(){
         try {
             historyHourlyService.dateInsertHistoryHourlyJKAvg(null,null);
         } catch (Exception e) {

--
Gitblit v1.8.0