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

jinpengyong

2023-08-18 4a64c0801f147536ed0a9d09977941f313a286ae

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

@@ -37,4 +37,11 @@
     */
    List<HistoryHourly> getValueByMacAndTime(String mac, Date startDate, Date endDate);

    //设备小时数据，最大值，最小值，均值统计入表
    void insertHistoryHourlyComplete();


    void dateToChangShu(String time);


}