Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

3 天以前 283ea8cfd97f225d0451d57bf915e6f3a0f2041b

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousing.java

@@ -67,4 +67,7 @@
    @ApiModelProperty(value = "盘点id")
    @TableField("inventory_id")
    private String inventoryId;

    @ApiModelProperty(value = "入库状态 1=草稿 2=正常")
    private Integer status;
}