Merge remote-tracking branch 'origin/master'

xuhy

2025-10-16 9c302dc54f22e274eabc7ec3189aa1e217430944

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