Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-06 3c3250c96a13c796aa88f1366b6d278cb95739e5

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

@@ -12,6 +12,8 @@


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



}