From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/UserMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 9b07fdf..f32c47b 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/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"/>
@@ -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>

--
Gitblit v1.8.0