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

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

 src/main/java/com/moral/mapper/HistoryMapper.java

@@ -18,4 +18,6 @@
   

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



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



}