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/BomImportDto.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/BomImportDto.java b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
index 0cea81a..a70f078 100644
--- a/src/main/java/com/ruoyi/production/dto/BomImportDto.java
+++ b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
@@ -7,29 +7,22 @@
@Data
public class BomImportDto {
-
- @Excel(name = "鐖堕」浜у搧缂栧彿")
- private String parentCode;
-
- @Excel(name = "鐖堕」浜у搧鍚嶇О")
+ @Excel(name = "鐖朵骇鍝佸悕绉�")
private String parentName;
- @Excel(name = "鐖堕」浜у搧瑙勬牸")
+ @Excel(name = "鐖朵骇鍝佽鏍�")
private String parentSpec;
- @Excel(name = "瀛愰」浜у搧缂栧彿")
- private String childCode;
-
- @Excel(name = "瀛愰」浜у搧鍚嶇О")
+ @Excel(name = "瀛愪骇鍝佸悕绉�")
private String childName;
- @Excel(name = "瀛愰」浜у搧瑙勬牸")
+ @Excel(name = "瀛愪骇鍝佽鏍�")
private String childSpec;
@Excel(name = "鍗曚綅鐢ㄩ噺")
private BigDecimal unitQty;
- @Excel(name = "鎶曟枡宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
@Excel(name = "澶囨敞")
--
Gitblit v1.9.3