modified:   app/views/vshop/goods.html.erb
	modified:   config/columns/member.yml
Merge branch 'master' of https://github.com/jason0037/vt