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

liujie

2 天以前 c8f6f175a23e15b40309cf31850ee170d8d946ca

 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;
}