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

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
index 8e8317e..941fb49 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
@@ -48,8 +48,11 @@
     @Schema(description = "宸ヨ壓璺嚎缂栫爜")
     private String processRouteCode;
 
-    @Schema(description = "鍏宠仈bom鐨刬d")
-    private Integer bomId;
+    @Schema(description = "鍩虹bom鐨刬d")
+    private Long bomId;
+
+    @Schema(description = "璁㈠崟bom鐨刬d")
+    private Long orderBomId;
 
     @Schema(description = "鍒涘缓浜篒D")
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.9.3