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

ZhuDongming

2019-08-22 d10235124e675103c1a27fb5aeff337493413cc2

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



}