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

cjl

2023-08-15 224cd3ff175864f6f8ac4bd24468809e73e4115f

 screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java

@@ -40,4 +40,8 @@
    //设备小时数据，最大值，最小值，均值统计入表
    void insertHistoryHourlyComplete();


    void dateToChangShu(String time);


}