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

chen_xi

2022-09-27 f4ab89e7032bea8d3c7e05a44946c3fdb58b7473

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

@@ -21,7 +21,4 @@

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

    Double getSensorSumByMacs(@Param("sensorCode") String sensorCode, @Param("macs") List<String> macs, @Param("time") String time, @Param("timeUnits") String timeUnits);

    Double getSensorAvgByMacs(@Param("sensorCode") String sensorCode, @Param("macs") List<String> macs, @Param("time") String time, @Param("timeUnits") String timeUnits);
}