From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java
index 2a0571d..646d3cb 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderWorkOrderDetailVo.java
@@ -9,6 +9,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -42,6 +43,9 @@
         @Schema(description = "鎶ュ伐涓讳俊鎭�")
         private ProductionProductMain reportMain;
 
+        @Schema(description = "宸ユ椂")
+        private BigDecimal workHour;
+
         @Schema(description = "鎶ュ伐浜у嚭鏄庣粏")
         private List<ProductionProductOutput> reportOutputList;
 
@@ -62,6 +66,9 @@
         @Schema(description = "鎶ュ伐涓讳俊鎭�")
         private ProductionProductMain reportMain;
 
+        @Schema(description = "宸ユ椂")
+        private BigDecimal workHour;
+
         @Schema(description = "璐ㄦ涓讳俊鎭�")
         private QualityInspect inspect;
 

--
Gitblit v1.9.3