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

cjl

2023-07-12 08b52ba6e8930958456ed58a1d39805caa7fe014

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

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

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

}