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

ZhuDongming

2019-08-29 ef3a45a366ea8451f2581547fa6a3894bd1d672f

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

@@ -22,5 +22,9 @@
   Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);



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

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

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



}