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

jinpengyong

2023-10-27 f86b4032c5824c4e69821ce9b795e8a7c236c799

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

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

    void dateToChangShu(String time);

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


}