wxd / MShopWeApp

Merge branch 'qa' into 'master'

Merge branch 'test' into 'qa'

Test

See merge request !1150

See merge request !1151