Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

2 天以前 c8712bbf027d7c3db9c33f8b015abed1473d06a7

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

@@ -40,13 +40,20 @@
    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "变更商品编号")
    private String matnr;

    /**
     * 序列码
     * 商品编号
     */
    @ApiModelProperty(value= "序列码")
    @ApiModelProperty(value= "商品编号")
    @TableField("matnr_old")
    private String matnrOld;

    /**
     * 批号
     */
    @ApiModelProperty(value= "批号")
    private String batch;

    /**