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

@@ -114,9 +114,9 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String performance;
     private String performance;
 
 
     /**
     /**
-     * 元素
+     * 成分
      */
      */
-    @ApiModelProperty("元素")
+    @ApiModelProperty("成分")
     private String element;
     private String element;
 
 
     /**
     /**

@@ -120,10 +120,10 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private String performance;
     private String performance;
 
 
     /**
     /**
-     * 元素
+     * 成分
      */
      */
-    @ApiModelProperty("元素")
-    @Length(message = "元素最多允许500个字符！")
+    @ApiModelProperty("成分")
+    @Length(message = "成分最多允许500个字符！")
     private String element;
     private String element;
 
 
     /**
     /**

@@ -127,10 +127,10 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private String performance;
     private String performance;
 
 
     /**
     /**
-     * 元素
+     * 成分
      */
      */
-    @ApiModelProperty("元素")
-    @Length(message = "元素最多允许500个字符！")
+    @ApiModelProperty("成分")
+    @Length(message = "成分最多允许500个字符！")
     private String element;
     private String element;
 
 
     /**
     /**