From 8817c6ab14348b360db70ad748dccb4aef692552 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 16:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..ec43eef 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -1,18 +1,34 @@
package com.ruoyi.production.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.production.pojo.ProductStructure;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductStructureDto extends ProductStructure {
@ApiModelProperty(value = "宸ヨ壓鍚嶇О")
private String processName;
- @ApiModelProperty(value = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
+
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String productName;
+
@ApiModelProperty(value = "浜у搧id")
private Long productId;
private String model;
+
+ @TableField(exist = false)
+ private String tempId;
+
+ @TableField(exist = false)
+ private String parentTempId;
+
+ @TableField(exist = false)
+ private List<ProductStructureDto> children;
}
--
Gitblit v1.9.3