Merge remote-tracking branch 'origin/dev' into dev

hongjli

2025-05-22 e4efff6637f4d598a7efdfca8b62fbb4c3286b02

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java

@@ -109,11 +109,12 @@
            // 格式：yyyy-MM
            @RequestParam String date,
            @RequestParam String factory,
            @RequestParam String major,
            // 格式：yyyy-MM
            @RequestParam String toStart,
            // 格式：yyyy-MM
            @RequestParam String toEnd) {
        apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd);
        apsGasPipelineCapacityPlanService.copyPlan(date, factory, major, toStart, toEnd);
        return success();
    }