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

whycq

2024-07-03 2ee70a38e4c832e3888b12d29ebf962456069cdb

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

@@ -48,7 +48,8 @@
    @ApiModelProperty(value= "颜色")
    private String color;

    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "类型")
//    @ApiModelProperty(value= "品牌")
    private String brand;

    @ApiModelProperty(value= "单位")
@@ -151,6 +152,10 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "bom号")
    @TableField("bom_code")
    private String bomCode;

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