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

cjl

2023-07-07 1e6dbe352c35a54c299008c523e38b1e59d1ea03

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