TA306 服务商”我的信息“页面支持上传店铺照片功能
Merge branch 'master' of github.com:antme/x-e-commerce

Conflicts:
	ecommerce/ecservice/src/main/java/com/ecom/bean/ServiceProvider.java