Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

5 小时以前 5127f46eedeede5cbfeae7a4908ddac11d332494

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

@@ -80,6 +80,12 @@
    private Integer lev1;

    /**
     * 组
     */
    @ApiModelProperty(value= "组")
    private Integer gro1;

    /**
     * 满板
     */
    @ApiModelProperty(value= "满板")
@@ -106,7 +112,7 @@
    @TableField("out_enable")
    private String outEnable;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "入库时间")
    @TableField("io_time")
    private Date ioTime;