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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

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

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

    void dateToChangShu(String time);

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


}