From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

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

diff --git a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanSummaryDto.java
index 0831d89..261f110 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 productSpec;
+    private String specification;
 
     /**
      * 浜у搧闀垮害
@@ -67,4 +67,10 @@
     @ApiModelProperty("姹囨�绘柟鏁�")
     private BigDecimal volume;
 
+    /**
+     * 鍩烘湰鍗曚綅
+     */
+    @ApiModelProperty("鍩烘湰鍗曚綅")
+    private String baseUnit;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3