From 2757f1d46f388f684aad93b3dc7ad805c45c6248 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 09:28:39 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

---
 src/main/java/com/ruoyi/production/dto/ProductStructureDto.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index 3272f67..24b783c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -4,13 +4,19 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ProductStructureDto extends ProductStructure {
 
     @ApiModelProperty(value = "宸ヨ壓鍚嶇О")
     private String processName;
     @ApiModelProperty(value = "浜у搧鍚嶇О")
-    private String speculativeTradingName;
+    private String productName;
     @ApiModelProperty(value = "浜у搧id")
     private Long productId;
+
+    private String model;
+
+    private List<ProductStructure> productStructureList;
 }

--
Gitblit v1.9.3