From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TErpGoodsInventoryQuery.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..9c82ed2 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
@@ -30,9 +30,11 @@
private String batchNumber;
@ApiModelProperty(value = "仓库id")
- @NotBlank(message = "仓库id不能为空")
+// @NotBlank(message = "仓库id不能为空")
private String warehouseId;
+ @ApiModelProperty(value = "有效期预警 出库使用 条件1 其他不传")
+ private Integer type;
}
--
Gitblit v1.7.1