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

whycq

2022-12-06 629e1bd85e9640c5d4ca34f8a1ab4a99cc4e2a6d

 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;