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

cjl

2023-07-10 90362d592d28927e5ab56f9b24f97d1f9089b50b

 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();

}