From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java
index 514452a..fb65e10 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java
@@ -26,6 +26,12 @@
     @ApiModelProperty("搴撳尯ID")
     private Long areaId;
 
+    @ApiModelProperty("浠撳簱ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("涓诲崟ID")
+    private Long areaMatId;
+
     @ApiModelProperty("搴撲綅绫诲瀷")
     private List<Long> typeId;
 

--
Gitblit v1.9.1