From 124a6178ae918de05886b52199b7755d4fa1ece3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/production/pojo/ProcessRoute.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index fe661b3..81ebd75 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -18,7 +18,7 @@
     private Long id;
 
     @ApiModelProperty(value = "浜у搧ID")
-    //product_model
+    //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material_sku
     private Long productModelId;
 
     @ApiModelProperty(value = "鎻忚堪")
@@ -41,4 +41,10 @@
 
     @ApiModelProperty(value = "BOM鐨処D")
     private Integer bomId;
+
+    @ApiModelProperty(value = "鐘舵�侊細0-鑽夌锛�1-宸叉壒鍑�")
+    private Boolean status;
+
+    @ApiModelProperty(value = "浜у搧绫诲瀷瀛楀吀缂栫爜")
+    private Long dictCode;
 }

--
Gitblit v1.9.3