Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-06-08 84d7dbea21cbe9276bd1eccdb3e60daef095242e

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

@@ -99,7 +99,7 @@

    @ApiModelProperty(value= "库位号")
    @TableField("loc_no")
    private Date locNo;
    private String locNo;

    @ApiModelProperty(value= "状态")
    private String status;