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

zhanghl

2025-05-23 687c9b21d0c8aedbd0c3f2d64b11cfaad5e38e85

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java

@@ -60,5 +60,5 @@
     */
    public int deleteApsGasPipelineCapacityPlanById(Long id);

    void copyPlan(String date, String factory, String toStart, String toEnd);
    void copyPlan(String date, String factory, String major, String toStart, String toEnd);
}