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

cjl

2023-08-30 2e0bf4423c235802791012e1fb0817d2c9156b2a

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

@@ -21,6 +21,8 @@

    String selectHourlyData(Map<String,Object> params);

    List<Map<String,Object>> selectHourlyListData(Map<String,Object> params);

    List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time);


@@ -37,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);
}