Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java

@@ -116,4 +116,18 @@
        }
        return ReturnT.SUCCESS;
    }

    //海城小时数据统计
    @XxlJob("dateInsertHistoryHourlyAvg")
    public ReturnT dateInsertHistoryHourlyAvg(){
        try {
            historyHourlyService.dateInsertHistoryHourlyAvg();
        } catch (Exception e) {
            e.printStackTrace();
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }


}