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

whycq

2023-09-15 a9e8a91fd4c8c504d7df9ef921f32d832390e77d

 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;