Commit b5e71fa1397a9ff0e3e7f38e8b7a79b8b08e566e

Authored by season
2 parents 399d1526 54fae079

Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa