Commit 823ecff8890dc5e9eb1d4875bdb41fc253dd20fe

Authored by season
2 parents c88b4dd2 b5472c2e

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