Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 a390fec8fd0821ad5e31e335d34de227ef59c65f

 src/main/resources/mapper/UserMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.UserMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.User">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.User">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="user_uuid" jdbcType="VARCHAR" property="userUuid"/>
        <result column="user_name" jdbcType="VARCHAR" property="userName"/>
@@ -92,7 +92,7 @@
    </select>


    <select id="userPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.user.UserPageRequestVO">
    <select id="userPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.user.UserPageRequestVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_user
@@ -108,7 +108,7 @@
    </select>


    <insert id="insertUser" parameterType="com.ycl.jxkg.domain.User"
    <insert id="insertUser" parameterType="com.ycl.jxkg.domain.entity.User"
            useGeneratedKeys="true" keyProperty="id">
        insert into t_user
            (user_uuid, user_name, password, real_name, age, last_active_time)
@@ -128,7 +128,7 @@
    </insert>


    <update id="updateUser" parameterType="com.ycl.jxkg.domain.User">
    <update id="updateUser" parameterType="com.ycl.jxkg.domain.entity.User">
        update t_user
        <set>
            <if test="realName != null">real_name = #{realName},</if>