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

LSH

2023-09-26 bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23

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

@@ -158,6 +158,9 @@
    @TableField("mat_type")
    private Integer matType;

    @ApiModelProperty(value= "客户信息ID")
    private Long owner;

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