From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..65e93c2 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,7 +10,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
@Data
@ExcelIgnoreUnannotated
@@ -61,5 +60,8 @@
private BigDecimal workHours;
private BigDecimal wages;
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+
}
--
Gitblit v1.9.3