搜索页面
zhuchao92-2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/fragment_interprise_main.xml
zhuchao93-1
zhuchao93-1
zhuchao93-1
搜索页面
Merge remote-tracking branch 'origin/master'
zhuchao93-1
搜索页面
搜索页面，添加分类搜索功能。
Merge remote-tracking branch 'origin/master'
Merge branch 'promote_branch'

Conflicts:
	app/src/main/java/com/promote/ebingo/publish/login/RegisterActivity.java
	app/src/main/java/com/promote/ebingo/publish/login/RegisterInputYzm.java
	app/src/main/java/com/promote/ebingo/search/SearchActivity.java
搜索页面，添加分类搜索功能。
添加不同搜索类型
Merge branch 'zhuchao'

Conflicts:
	app/src/main/java/com/promote/ebingo/application/HttpConstant.java
	app/src/main/java/com/promote/ebingo/bean/SearchHistoryBean.java
	app/src/main/java/com/promote/ebingo/bean/SearchInterpriseBean.java
	app/src/main/java/com/promote/ebingo/publish/PublishFragment.java
	app/src/main/java/com/promote/ebingo/publish/login/RegisterActivity.java
	app/src/main/java/com/promote/ebingo/publish/login/RegisterInputYzm.java
	app/src/main/java/com/promote/ebingo/search/SearchActivity.java
	app/src/main/java/com/promote/ebingo/search/SearchListAdapter.java
	app/src/main/res/layout/activity_search.xml
	app/src/main/res/values/strings.xml
zhuchao93-1
更新首页素材
Merge branch 'promote_branch'
zhuchao93-1