Merge remote-tracking branch 'origin/cjl' into dev

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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) {