From b95f5fb1af8a80ac03a8da8da3e863ad468bf477 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 13 九月 2025 14:58:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java
index e647ec4..bf24c79 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java
@@ -33,6 +33,8 @@
     @NotBlank(message = "仓库id不能为空")
     private String warehouseId;
 
+    @ApiModelProperty(value = "有效期预警 出库使用 条件1  其他不传")
+    private Integer type;
 
 
 }

--
Gitblit v1.7.1