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

ZhuDongming

2019-09-02 e8ef361dc975aeaedeee6f28dfe679489a22f9d5

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

@@ -26,5 +26,7 @@
   Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters);

   

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

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



}