Commit 8a4e95964fba0d8347159de61a6da8a362790218

Authored by yvan.ni
2 parents 91843c0f b052979c

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