逻辑功能结束
上传3的图片流程实现
Merge branch 'master' into zhuchao

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java
	app/src/main/res/layout/activity_product_info.xml