Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

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

@@ -12,8 +12,10 @@


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



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

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



}