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

ZhuDongming

2020-01-09 5fcdc8ba338a9f8730262970547274b0dcfe6b4d

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

@@ -25,6 +25,8 @@
   

   Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters);

   

   Map<String, Object> getMointorPointRankByOrganizationId(Map<String, Object> parameters);

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

	
   Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters);



}