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

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

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