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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

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

@@ -43,5 +43,8 @@

    void dateToChangShu(String time);

    //计算海城市的小数数据
    void dateInsertHistoryHourlyAvg();


}