Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

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



}