Commit 1977d71af709aedf5a72c988f9040cc2a1dbeaa5

Authored by season
2 parents 1be63c81 07d27540

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