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

Administrator

7 天以前 f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce

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

@@ -51,7 +51,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "规格")
    private String matnr;

    /**