Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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



}