From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器
---
src/main/java/com/ruoyi/production/controller/ProductionAccountController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionAccountController.java b/src/main/java/com/ruoyi/production/controller/ProductionAccountController.java
index b401446..d3ec36f 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionAccountController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionAccountController.java
@@ -86,6 +86,8 @@
exportDto.setWorkHour(item.getWorkHour());
exportDto.setQuantity(item.getQuantity());
exportDto.setWorkHours(item.getWorkHours());
+ exportDto.setOriginalWages(item.getOriginalWages());
+ exportDto.setAdjustAmount(item.getAdjustAmount());
exportDto.setWages(item.getWages());
return exportDto;
})
--
Gitblit v1.9.3