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

whycq

2023-01-30 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7

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

@@ -33,7 +33,7 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

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

    @ApiModelProperty(value= "单据编号")
@@ -152,6 +152,9 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "是否冻结")
    private Integer frozen;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){