From 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 18:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index cbac4b5..ac13e04 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -71,4 +71,10 @@
@Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
+
+ @Schema(description = "杞﹂棿id")
+ private Long workshopId;
+
+ @Schema(description = "杞﹂棿鍚嶇О")
+ private String workshopName;
}
--
Gitblit v1.9.3