Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

 src/main/java/com/moral/service/AlarmDailyService.java

@@ -10,4 +10,6 @@


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



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



}