Commit 8b3ba506e50a605bdefcdde15f3bc39ab3340a8d

Authored by season
2 parents 06f716a8 de6cd7aa

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