From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 2a9ffae..df83127 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -31,8 +31,8 @@
@Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
private Long technologyRoutingOperationId;
- @Schema(description = "宸ヨ壓璺嚎id")
- private Long technologyRoutingId;
+ @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎id")
+ private Long orderRoutingId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
--
Gitblit v1.9.3