From 968ace59bdbb99d33caa16a88bc247afaa3b7c4c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 11:00:02 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 3fde6d7..3b292a0 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,6 +10,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @ExcelIgnoreUnannotated
@@ -72,4 +73,7 @@
     private String otherData;
     // 宸ュ簭id
     private Long processId;
+
+    //鍘熸枡
+    private List<DrawMaterialDto> drawMaterialList;
 }

--
Gitblit v1.9.3