From db85e062349683b3131726fe90dcc99d4aff35ba Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 一月 2026 13:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 10 +++++++++-
1 files changed, 9 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 e57b11e..24b783c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -4,11 +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