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

ZhuDongming

2019-07-31 33ca0da19b3f87751662de0072c48ce9ce963202

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

@@ -21,4 +21,6 @@


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



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



}