From db85e062349683b3131726fe90dcc99d4aff35ba Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 一月 2026 13:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index 11c658e..5689dae 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -7,11 +7,10 @@
@Data
public class ProcessRouteDto extends ProcessRoute {
- @ApiModelProperty(value = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
-
private Long productId;
+ private String productName;
+
@ApiModelProperty("瑙勬牸")
private String model;
}
--
Gitblit v1.9.3