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

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

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

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



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

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



}