Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

}