From 0b343113e2fc93ae6679adadc075d92dbcf7f5c8 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 22 五月 2025 14:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index fae1314..744750a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -109,11 +109,12 @@
             // 鏍煎紡锛歽yyy-MM
             @RequestParam String date,
             @RequestParam String factory,
+            @RequestParam String major,
             // 鏍煎紡锛歽yyy-MM
             @RequestParam String toStart,
             // 鏍煎紡锛歽yyy-MM
             @RequestParam String toEnd) {
-        apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd);
+        apsGasPipelineCapacityPlanService.copyPlan(date, factory, major, toStart, toEnd);
         return success();
     }
 

--
Gitblit v1.9.3