From 51c806f81b4498b2196025c97a94c51b1bb3eeb9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 15:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index 8faf1a8..b52c596 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -1,11 +1,39 @@
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 productCode;
+
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
private String productName;
+
+ @ApiModelProperty(value = "浜у搧id")
+ //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material
+ private Long productId;
+
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ 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