From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index 5376342..dee1d34 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -1,18 +1,21 @@
package com.ruoyi.production.dto;
-import com.ruoyi.production.pojo.ProductStructure;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
@Data
-public class ProductStructureDto extends ProductStructure {
-
- @ApiModelProperty(value = "宸ヨ壓鍚嶇О")
+public class ProductStructureDto {
+ private Long id;
+ private Long bomId;
+ private Long parentId;
+ private Long productModelId;
+ private BigDecimal unitQuantity;
+ private String unit;
+ private Long processId;
private String processName;
- @ApiModelProperty(value = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
- @ApiModelProperty(value = "浜у搧id")
- private Long productId;
-
+ private String productName;
private String model;
+ private List<ProductStructureDto> children;
}
--
Gitblit v1.9.3