Commit 6fe1c946cfbe7585254e171903cfd5ac36df7dcd

Authored by season
2 parents 755c6e5f 15d8c4cb

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