Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-04 9891b042e48b186bbb850ab2ed445308bf5eec72

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

@@ -91,7 +91,7 @@

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

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