From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/dto/BomImportDto.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/BomImportDto.java b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
index e53fd4f..7f8689b 100644
--- a/src/main/java/com/ruoyi/production/dto/BomImportDto.java
+++ b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
@@ -8,11 +8,17 @@
@Data
public class BomImportDto {
- @Excel(name = "缂栧彿")
- private String code;
+ @Excel(name = "鐖堕」浜у搧鍚嶇О")
+ private String parentName;
- @Excel(name = "鐖堕」缂栧彿")
- private String parentCode;
+ @Excel(name = "鐖堕」浜у搧瑙勬牸")
+ private String parentSpec;
+
+ @Excel(name = "瀛愰」浜у搧鍚嶇О")
+ private String childName;
+
+ @Excel(name = "瀛愰」浜у搧瑙勬牸")
+ private String childSpec;
@Excel(name = "鍗曚綅鐢ㄩ噺")
private BigDecimal unitQty;
@@ -22,4 +28,4 @@
@Excel(name = "澶囨敞")
private String remark;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3