From 51c806f81b4498b2196025c97a94c51b1bb3eeb9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 15:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java
index 261f110..2c31eff 100644
--- a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java
+++ b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java
@@ -35,7 +35,7 @@
      * 浜у搧瑙勬牸
      */
     @ApiModelProperty("浜у搧瑙勬牸")
-    private String specification;
+    private String model;
 
     /**
      * 浜у搧闀垮害
@@ -71,6 +71,6 @@
      * 鍩烘湰鍗曚綅
      */
     @ApiModelProperty("鍩烘湰鍗曚綅")
-    private String baseUnit;
+    private String unit;
 
 }
\ No newline at end of file

--
Gitblit v1.9.3