Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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



}