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

whycq

2024-06-19 e2bf626591840e654627f0ca4188449acafcab9b

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

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

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

    @ApiModelProperty(value= "单位")