Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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



}