Task: 分离服务商字段‘服务网点’为独立对象‘SpStore’.
Merge branch 'master' of github.com:antme/x-e-commerce

Conflicts:
	ecommerce/ecservice/src/main/java/com/ecom/service/impl/SProviderServiceImpl.java