From bb078cde6d9641ec84ee3c52b544153845795c0e Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 13 七月 2026 21:00:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_山西长治

---
 src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
index 752a839..04de53d 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
@@ -90,4 +90,7 @@
 
     @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭ID")
     private Long productionOrderRoutingOperationId;
+
+    @Schema(description = "鐢熶骇鎶ュ伐琛↖D")
+    private Long productionProductMainId;
 }

--
Gitblit v1.9.3