Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-07 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b

 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;