Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

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

@@ -14,4 +14,6 @@


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



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



}