From ba55749a30a2a2a09a2c64669d6b344a5d8ddb53 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 18 十月 2024 14:08:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 61ec6b3..5180618 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -243,7 +243,6 @@
             ge.deleted = 0
             AND divi.deleted = 0
             AND blo.deleted = 0
-            AND cont.deleted = 0
             <if test="intakeName != null and intakeName != ''">
                 AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
             </if>
@@ -325,7 +324,6 @@
             ge.deleted = 0
             AND divi.deleted = 0
             AND blo.deleted = 0
-            AND cont.deleted = 0
             <if test="intakeName != null and intakeName != ''">
                 AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
             </if>

--
Gitblit v1.8.0