Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-10-18 ba55749a30a2a2a09a2c64669d6b344a5d8ddb53

 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>