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/pojo/ProductionOperationTask.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
index edcd62f..08399e9 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
@@ -28,8 +28,8 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
-    private Long technologyRoutingOperationId;
+    @Schema(description = "鐢熶骇宸ヨ壓璺嚎宸ュ簭琛╥d")
+    private Long productionOrderRoutingOperationId;
 
     @Schema(description = "褰曞叆鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
@@ -73,4 +73,7 @@
     @Schema(description = "閮ㄩ棬ID")
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
+
+    @Schema(description = "鏉冮檺鐢ㄦ埛ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傛寚瀹氬涓敤鎴稩D鏃讹紝鐢ㄩ�楀彿鍒嗛殧銆�")
+    private String userIds;
 }

--
Gitblit v1.9.3