Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy...

luxiaotao1123

2020-07-15 05ebcccc2c8099c0252501fea0e1797e5a1361d2

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

@@ -40,7 +40,7 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库号")
    @ApiModelProperty(value= "规格")
    private String lgnum;

    /**
@@ -58,7 +58,7 @@
    /**
     * 物料标签ID
     */
    @ApiModelProperty(value= "物料标签ID")
    @ApiModelProperty(value= "颜色")
    private String zmatid;

    /**