From a3c54410de03f0fd242e1a1118d6471300cf1eda Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 四月 2026 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
index d1b7c3a..04de53d 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -84,9 +82,15 @@
@Schema(description = "宸ュ簭鍙傛暟ID")
private Long technologyOperationParamId;
- @Schema(description = "宸ヨ壓璺嚎宸ュ簭ID")
- private Long technologyRoutingOperationId;
-
@Schema(description = "鏍囧噯鍊�")
private String standardValue;
+
+ @Schema(description = "杈撳叆鍊�")
+ private String inputValue;
+
+ @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭ID")
+ private Long productionOrderRoutingOperationId;
+
+ @Schema(description = "鐢熶骇鎶ュ伐琛↖D")
+ private Long productionProductMainId;
}
--
Gitblit v1.9.3