From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
index e302728..d205fa9 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
@@ -21,7 +21,12 @@
 
     private Long productId;
 
+    private String productName;
 
-    private List<ProductProcessRouteItem> processRouteItem;
-    private String specificationModel;
+    private String model;
+
+    private Boolean isComplete;
+
+    //鐗╂枡缂栫爜
+    private String materialCode;
 }

--
Gitblit v1.9.3