# Conflicts: # src/main/java/com/zhiwei/searchhotcrawler/bean/WeiBoUser.java # src/main/java/com/zhiwei/searchhotcrawler/crawler/WeiboHotSearchCrawler.java # src/main/java/com/zhiwei/searchhotcrawler/dao/WeiBoUserDao.java
