From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java |   12 ++++++++++++
 1 files changed, 12 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 81e6c3e..1bb26a4 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -4,9 +4,12 @@
 import com.ruoyi.production.pojo.ProductionOrder;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Schema(name = "ProductionOrderVo", description = "鐢熶骇璁㈠崟杩斿洖瀵硅薄")
 public class ProductionOrderVo extends ProductionOrder {
@@ -27,4 +30,13 @@
 
     @Schema(description = "浜у搧鍥剧墖")
     private List<StorageBlobVO> productImages;
+
+    @Schema(description = "bom缂栧彿")
+    private String bomNo;
+
+    @Schema(description = "瀹屾垚杩涘害")
+    private BigDecimal completionStatus;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    private Boolean returned;
 }

--
Gitblit v1.9.3