Commit d9959b517c1402fb188c1305632c751d61dfdee3

Authored by season
2 parents caab06dc f52845a3

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