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

jinpengyong

2023-09-28 5eb88939c094fac1f5dc9201b5af6da4165cc185

 screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java

@@ -39,4 +39,7 @@
//
//
//    Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
    void insertHistoryHourly(Map<String, Object> params);

    void updateHistoryHourly(Map<String, Object> params);
}