Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/mapper/AlarmMapper.java

@@ -10,6 +10,5 @@


public interface AlarmMapper extends BaseMapper<Alarm> {

   

   List<Map<String, Object>> getAlarmData(Map<String, Object> parameters);

   List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format);

   List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format,@Param("list") List<String> list);

}