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

LSH

2023-12-02 e4d5a0e37babc1ae214c34162e58f5084927d301

 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;