Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-29 1097d9b75533cd4686bc24cb06ed98010fcfcecf

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

@@ -12,4 +12,6 @@


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



   Map<String, Object> getAlarmDataByMonth(Map<String, Object> parameters);



}