测试git冲突

liurunyu

2023-12-01 88cd0922634e6bb20da6ea64209bd62d094b6b4c

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

@@ -67,7 +67,7 @@
                name like concat('%', #{name}, '%') and
            </if>
            <if test="phone != null">
                phone = '#{phone,jdbcType=VARCHAR}'
                phone = #{phone,jdbcType=VARCHAR}
            </if>
        </trim>
    </select>
@@ -80,13 +80,13 @@
                name like concat('%', #{name}, '%') and
            </if>
            <if test="phone != null">
                phone = '#{phone,jdbcType=VARCHAR}'
                phone = #{phone,jdbcType=VARCHAR}
            </if>
        </trim>
        order by id DESC
        <trim prefix="limit " >
            <if test="start != null and count != null">
                #{start}, #{count}
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
            </if>
        </trim>
    </select>
@@ -98,8 +98,8 @@
        #{password,jdbcType=VARCHAR},
        #{orgTag,jdbcType=VARCHAR},
        #{supperAdmin,jdbcType=TINYINT},
        #{disabled,jdbcType=TINYINT},
        #{deleted,jdbcType=TINYINT}
        #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
        #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
        )
    </insert>
    <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
@@ -150,10 +150,10 @@
                #{supperAdmin,jdbcType=TINYINT},
            </if>
            <if test="disabled != null">
                #{disabled,jdbcType=TINYINT},
                #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
            </if>
            <if test="deleted != null">
                #{deleted,jdbcType=TINYINT},
                #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
            </if>
        </trim>
    </insert>
@@ -171,10 +171,10 @@
                password = #{password,jdbcType=VARCHAR},
            </if>
            <if test="disabled != null">
                disabled = #{disabled,jdbcType=TINYINT},
                disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
            </if>
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT},
                deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
            </if>
        </set>
        where id = #{id,jdbcType=BIGINT}
@@ -184,8 +184,8 @@
        set `name` = #{name,jdbcType=VARCHAR},
        phone = #{phone,jdbcType=VARCHAR},
        password = #{password,jdbcType=VARCHAR},
        disabled = #{disabled,jdbcType=TINYINT},
        deleted = #{deleted,jdbcType=TINYINT}
        disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="changePassword" >