From 695d501ce0a2eacecc58bb94892a5acfbf4eccca Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 16:18:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
index 284bd03..c5cc0cc 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
@@ -42,6 +42,9 @@
             <if test="dayProduceAllNum != null "> and day_produce_all_num = #{dayProduceAllNum}</if>
             <if test="days != null "> and days = #{days}</if>
             <if test="monthProduceAllNum != null "> and month_produce_all_num = #{monthProduceAllNum}</if>
+<!--            <if test="major != null and major != ''">-->
+<!--                and process_name in (select process_name from aps_standard_process where major=#{major})-->
+<!--            </if>-->
         </where>
     </select>
     

--
Gitblit v1.9.3