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

LSH

2023-05-22 ef63958fa8c4667de0d6ca7680c4a10792ebee38

 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;