Merge branch 'wb' into qa

cjl

2023-09-27 f0a5a28345ed6764ac033a585f1e6b7cbcf8d102

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