Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsProductController.java

@@ -143,7 +143,7 @@ public class GoodsProductController {
                 builder.put("prodBarcode", "商品条形码");
                 builder.put("prodName", "商品中文名");
                 builder.put("prodEname", "商品英文名");
-                builder.put("prodBrand", "品牌");
+//                builder.put("prodBrand", "品牌");
                 builder.put("unitCode", "计量单位");
                 builder.put("cusGoodsCode", "商品编码");
                 builder.put("cusDeclEle", "申报要素（海关规格型号）");