Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-29 ef3a45a366ea8451f2581547fa6a3894bd1d672f

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



}