From d48878d3ddbf89c72e361bae7eb5c0e9ff96f9aa Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 28 六月 2024 09:27:21 +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 939f3f1..2ee04fa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -224,7 +224,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>
@@ -284,7 +283,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