From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java
index a3dd70e..66aa60e 100644
--- a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanDto.java
@@ -33,11 +33,11 @@
*/
@ApiModelProperty("浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
- private String specification;
+ private String model;
@ApiModelProperty("浜у搧鍗曚綅")
@Excel(name = "浜у搧鍗曚綅")
- private String baseUnit;
+ private String unit;
@ApiModelProperty(value = "鐢熶骇璁″垝id闆嗗悎")
private List<Long> ids;
@@ -55,4 +55,5 @@
*/
@ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
private Long productMaterialId;
+
}
--
Gitblit v1.9.3