http://git.zhiweidata.top/zhangzhiwei/media_data_crawler.git

Conflicts:
	src/main/java/com/zhiwei/media_data_crawler/crawler/BaiduNewsCrawlerParse.java
	src/main/java/com/zhiwei/media_data_crawler/data/DataCrawler.java
	src/test/java/com/zhiwei/media_data_crawler/test/DataCrawlerTest.java