个人中心我的搜藏
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/center/CenterFragment.java
购买详情接口测试，产品详情接口添加
Merge branch 'promote_branch'
18:20
Merge branch 'zhuchao'

Conflicts:
	app/src/main/java/com/promote/ebingo/center/MyPrivilegeActivity.java
	app/src/main/java/com/promote/ebingo/publish/PublishDemand.java
	app/src/main/java/com/promote/ebingo/publish/PublishSupply.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml