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

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java