From e529b1dd89b5f2927457a284e660d489b9aa8cc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index fccf7b1..3b292a0 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,6 +10,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.List;
@Data
@ExcelIgnoreUnannotated
@@ -41,6 +42,9 @@
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
//鍗曚綅
@Excel(name = "鍗曚綅")
private String unit;
@@ -60,6 +64,16 @@
private BigDecimal workHours;
private BigDecimal wages;
+ @ApiModelProperty(value = "鎶曞叆鎬婚噺(kg)")
+ private BigDecimal totalInvestment;
private BigDecimal inspectedQuantity;
+
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+ // 宸ュ簭id
+ private Long processId;
+
+ //鍘熸枡
+ private List<DrawMaterialDto> drawMaterialList;
}
--
Gitblit v1.9.3