Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockVO.java

@@ -41,7 +41,7 @@ public class WebsitStockVO {
     @ApiModelProperty("单位")
     private String goodsStockUnit;
     @ZfireField(tbName = "b")
-    @ApiModelProperty("商品代码")
+    @ApiModelProperty("辅材代码")
     private String goodsCode;
     @ZfireField(tbName = "b")
     @ApiModelProperty("规格型号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsMVO.java

@@ -15,23 +15,23 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class WebsitGoodsMVO {
 
-    @ApiModelProperty(value = "商品编号")
+    @ApiModelProperty(value = "辅材编号")
     private String goodsId;
 
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ApiModelProperty(value = "商品名称")
+    @ApiModelProperty(value = "辅材名称")
     private String goodsName;
 
-    @ApiModelProperty(value = "商品代码")
+    @ApiModelProperty(value = "辅材代码")
     private String goodsCode;
 
 //    @ApiModelProperty(value = "商品条码")
 //    private String goodsBarcodeId;
 
     @ZfireField(hide = true, tbName = "b", colName = "parent_category_id")
-    @ApiModelProperty(value = "商品父类编号")
+    @ApiModelProperty(value = "辅材父类编号")
     private String parentCategoryId;
 
     @ZfireField(tbName = "b", colName = "parent_category_name")
@@ -39,7 +39,7 @@ public class WebsitGoodsMVO {
     private String parentCategoryName;
 
     @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品小类编号")
+    @ApiModelProperty(value = "辅材小类编号")
     private String goodsCategoryId;
 
     @ZfireField(tbName = "b", colName = "category_name")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitNormChargeVO.java

@@ -22,7 +22,7 @@ public class WebsitNormChargeVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ApiModelProperty(value = "辅材名称")
+    @ApiModelProperty(value = "收费项目名称")
     private String normName;
 
     @ApiModelProperty(value = "商品代码")