From afacb4a693c3b7e40ccdd55bc403850709ff8a34 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 10:08:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java |    4 ++--
 1 files changed, 2 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..d235ccb 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
@@ -21,7 +21,7 @@
 
     private Long productId;
 
+    private String productName;
 
-    private List<ProductProcessRouteItem> processRouteItem;
-    private String specificationModel;
+    private String model;
 }

--
Gitblit v1.9.3