Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

}