Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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

@@ -15,5 +15,7 @@
   List<String> selectNextLevelRegion(Map<String, Object> parameters);



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

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



}