From 425e388128ba159fb9ff714d6bde24caa25e85ef Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 18:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java
index b0f82ca..d407674 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java
@@ -14,6 +14,9 @@
     @ApiModelProperty("1 是非消耗,2是消耗 ")
     private Integer isConsume;
 
+    @ApiModelProperty("物资id")
+    private Long goodsMaterialsId;
+
 
     @ApiModelProperty("仓库id")
     private Long storeManagementId;

--
Gitblit v1.7.1