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

cl

昨天 f95a3c836f06078f41389051a9d1c01969a925cb

 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;