Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs

luxiaotao1123

2020-08-17 598a8da13e64b182312e5e14bfeba132f0422cd1

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

@@ -55,14 +55,14 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "商品类别")
    @ApiModelProperty(value= "物料类别")
    private String type;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "助记码")
    private String mnemonic;
    @ApiModelProperty(value= "颜色")
    private String color;

    /**
     * 仓库号