From 2cffa027595247c136a8ee95f5f745c58cb0cce5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 13:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
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