修改bug
继续修改
Merge branch 'master' of https://github.com/rj-angel/topic-parser

Conflicts:
	src/main/java/com/topic/parserAdapter/controller/module/ParseController.java
继续