From 575dbdab52632e01be4fde9590df27b348ac8f5f Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Fri, 6 Sep 2024 10:33:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20attribute=20=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=20=E7=94=A8=E6=88=B7=20userName=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/db/mapper/attribute/AttributeMapper.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/db/mapper/attribute/AttributeMapper.xml b/src/main/resources/db/mapper/attribute/AttributeMapper.xml
index 060d1f3..0150031 100644
--- a/src/main/resources/db/mapper/attribute/AttributeMapper.xml
+++ b/src/main/resources/db/mapper/attribute/AttributeMapper.xml
@@ -17,11 +17,13 @@
         <association property="createUser" columnPrefix="c_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
 
         <association property="updateUser" columnPrefix="u_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
             <id property="id" column="id"/>
             <result property="name" column="name"/>
+            <result property="userName" column="user_name"/>
         </association>
     </resultMap>
 
@@ -30,8 +32,10 @@
         ad.*,
         c.id as c_id,
         c.name as c_name,
+        c.user_name as c_user_name,
         u.id as u_id,
-        u.id as u_name
+        u.name as u_name,
+        u.user_name as u_user_name
         FROM
         attribute_dict ad
         left join sys_user c on ad.create_user_id = c.id