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 | 4 ++--
1 files changed, 2 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 5ae58d9..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)
--
Gitblit v1.9.3