Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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



}