From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
index 4c0dbe3..a39c83a 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
@@ -9,8 +9,6 @@
@Data
@Schema(name = "ProductionPlanVo", description = "鐢熶骇璁″垝杩斿洖瀵硅薄")
public class ProductionPlanVo extends ProductionPlan {
- @Schema(description = "鐗╂枡缂栫爜")
- private String materialCode;
@Schema(description = "浜у搧鍚嶇О")
private String productName;
@@ -21,6 +19,15 @@
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "鍏宠仈浜у搧鐗╂枡ID")
- private Long productMaterialId;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
+
+ @Schema(description = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Schema(description = "椤圭洰鍚嶇О")
+ private String projectName;
}
--
Gitblit v1.9.3