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

ZhuDongming

2019-09-03 ca66f2f175e6b66eda193ce58439515a9484e6b7

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



}