完成商品品牌和商品类型整体后端合并
Merge remote-tracking branch 'origin/master'