添加商品时，添加修改属性值
Merge branch 'master' of github.com:foright/yami

Conflicts:
	administrator/components/com_jshopping/controllers/products.php
测试提交