Merge remote-tracking branch 'origin/master'

Administrator

2023-12-07 1fbf81e162e6e16ffd927b736c3192ea3023c88e

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml

@@ -66,13 +66,13 @@
            <if test="blockId != null">
                bc.blockId = #{blockId,jdbcType=BIGINT} and
            </if>
            <if test="name != null">
            <if test="name != null and name != ''">
                bc.`name` like concat('%', #{name}, '%') and
            </if>
            <if test="num != null">
            <if test="num != null and num != ''">
                bc.num = #{num,jdbcType=VARCHAR} and
            </if>
            <if test="phone != null">
            <if test="phone != null and phone != ''">
                bc.phone = #{phone,jdbcType=VARCHAR} and
            </if>
        </trim>