zhuchao93-1
Merge branch 'master' of https://github.com/Ebingo/Ebingo into zhuchao
修改首页滚动条
zhuchao93-1
9-4
9-4
搜索功能添加
搜索功能添加
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
9-4
9-4
Merge branch 'zhuchao'
9-4
9-4
Merge pull request #10 from Ebingo/zhuchao

Zhuchao
添加标签
Merge branch 'master' into zhuchao
发现搜索
完善发现功能