From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

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

diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
index 0b56788..decdc39 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java
@@ -26,9 +26,15 @@
     @Schema(description = "宸ュ簭鍚嶇О")
     private String operationName;
 
-    @Schema(description = "宸ュ崟绫诲瀷 姝e父 /杩斿伐杩斾慨")
+    @Schema(description = "宸ュ崟绫诲瀷 姝e父/杩斿伐杩斾慨")
     private String workOrderType;
 
     @Schema(description = "瀹屾垚杩涘害")
     private BigDecimal completionStatus;
+
+    @Schema(description = "鎶ュ伐浜哄憳鍚嶇О锛屽涓娇鐢ㄩ�楀彿鍒嗛殧")
+    private String userNames;
+
+    @Schema(description = "鏄惁缁撴潫锛�")
+    private Boolean endOrder;
 }

--
Gitblit v1.9.3