From 41a77633d7be6d40195ce6fcb9a697bbc66e2fb5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 16:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 5 ++++-
1 files changed, 4 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 5ef224b..9776213 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
@@ -55,9 +54,13 @@
private LocalDate schedulingDate;
private String schedulingUserName;
private String customerName;
+ //宸ュ簭
+ @Excel(name = "宸ュ簭")
private String process;
private BigDecimal workHours;
private BigDecimal wages;
+ @ApiModelProperty(value = "鎶曞叆鎬婚噺(kg)")
+ private BigDecimal totalInvestment;
}
--
Gitblit v1.9.3