修改Store部分控制层和服务层
Merge remote-tracking branch 'origin/master'