给人中心，我的供应 界面
企业设置 完成
Merge remote-tracking branch 'origin/master'
标签 自动换行
个人中心-我的供应，求购。搜藏
Merge branch 'promote_branch'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/center/MySupplyActivity.java
	app/src/main/res/layout/mysupply_item.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
个人中心-我的供应，求购。搜藏
个人中心-我的供应，求购。搜藏
PrivilegeInfoFragment
Merge branch 'zhuchao'
发布完后跳转到详情页面
个人中心我的搜藏
Merge branch 'master'  13:30
Merge branch 'master' into zhuchao

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/application/HttpConstant.java
	app/src/main/java/com/promote/ebingo/center/ItemDelteDialog.java
	app/src/main/java/com/promote/ebingo/center/MyBookActivity.java
	app/src/main/java/com/promote/ebingo/center/MyCollectionActivity.java
	app/src/main/java/com/promote/ebingo/center/MyDemandActivity.java
	app/src/main/java/com/promote/ebingo/center/MySupplyActivity.java
	app/src/main/java/com/promote/ebingo/publish/PublishDemand.java
	app/src/main/java/com/promote/ebingo/publish/PublishSupply.java
	app/src/main/res/layout/mydemand_item_layout.xml
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