修改git乱版
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/BuyInfoActivity.java
求购搜索