From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +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 | 6 ++----
1 files changed, 2 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..842fc9b 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,6 @@
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "鍏宠仈浜у搧鐗╂枡ID")
- private Long productMaterialId;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
}
--
Gitblit v1.9.3