From 7496e718f10286651b9e2d08a8b8548cd3b242b6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 10:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

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

diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
index 0596973..cdf442e 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -32,4 +33,18 @@
 
     @Schema(description = "bom缂栧彿")
     private String bomNo;
+
+    @Schema(description = "瀹屾垚杩涘害")
+    private BigDecimal completionStatus;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    private Boolean returned;
+
+    @Schema(description = "杞﹂棿id")
+    private Long workshopId;
+
+    @Schema(description = "杞﹂棿鍚嶇О")
+    private String workshopName;
+
+
 }

--
Gitblit v1.9.3