Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

zjj

2023-11-21 ac0906df88505ec24ee910899a036676823f9d63

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

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

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

    @ApiModelProperty(value= "状态")
    private String status;
@@ -134,6 +134,13 @@
    @TableField("appe_user")
    private Long appeUser;

    @ApiModelProperty(value= "单据编号")
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "批号")
    private String batch;

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";