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

Administrator

8 天以前 f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -67,7 +67,7 @@
    @ApiModelProperty(value= "单位")
    private String unit;

    @ApiModelProperty(value= "单价")
    @ApiModelProperty(value= "单价 长度")
    private Double price;

    @ApiModelProperty(value= "sku")
@@ -106,7 +106,7 @@
    @ApiModelProperty(value= "长度")
    private Double length;

    @ApiModelProperty(value= "体积")
    @ApiModelProperty(value= "体积  毛重")
    private Double volume;

    @ApiModelProperty(value= "三方编码")