搜索功能添加
搜索功能添加
Merge branch 'promote_branch'

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/publish/PublishDemandFragment.java
Merge branch 'zhuchao'
添加标签
Merge branch 'master' into zhuchao