Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs...

luxiaotao1123

2020-08-24 a8ab74fdbc4e590a4c9778d447538c3bc30925e4

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

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

    /**
     * 仓库号