增加商品属性
Merge branch 'master' of github.com:guzeng/one

Conflicts:
	contrib/sql/140526.sql