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

zjj

2023-11-27 a61d079d0c7ebc50ddd088bfb568a21bb2f2592d

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

@@ -129,7 +129,7 @@
    @ApiModelProperty(value= "条形码")
    private String barcode;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "入库暂存数")
    @TableField("in_qty")
    private Integer inQty;