From 6f9a738a370f25d5fad645a08d6984554b481346 Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Fri, 6 Sep 2024 10:37:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20application=20signa?=
 =?UTF-8?q?ture=20=E8=AF=B7=E6=B1=82=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/mapper/app/ApplicationSignatureMapper.xml    | 2 +-
 src/main/resources/db/mapper/device/EnvironmentMapper.xml     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/db/mapper/app/ApplicationSignatureMapper.xml b/src/main/resources/db/mapper/app/ApplicationSignatureMapper.xml
index 113afc2..c065470 100644
--- a/src/main/resources/db/mapper/app/ApplicationSignatureMapper.xml
+++ b/src/main/resources/db/mapper/app/ApplicationSignatureMapper.xml
@@ -22,7 +22,7 @@
         asg.*,
         cu.id as c_id,
         cu.name as c_name,
-        cu.user_name as c_user_name,
+        cu.user_name as c_user_name
         FROM
         application_signature  asg
         left join sys_user cu on asg.create_user_id = cu.id
diff --git a/src/main/resources/db/mapper/device/EnvironmentMapper.xml b/src/main/resources/db/mapper/device/EnvironmentMapper.xml
index b395e36..fe35323 100644
--- a/src/main/resources/db/mapper/device/EnvironmentMapper.xml
+++ b/src/main/resources/db/mapper/device/EnvironmentMapper.xml
@@ -19,11 +19,13 @@
         <association property="createUser" columnPrefix="cu_" 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="uu_" 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="useUser" columnPrefix="u_" javaType="cn.hutool.json.JSONObject">
@@ -40,9 +42,11 @@
 
             cu.id AS cu_id,
             cu.name AS cu_name,
+            cu.user_name AS cu_user_name,
 
             uu.id AS uu_id,
             uu.name AS uu_name,
+            uu.user_name AS uu_user_name,
 
             es.user_id AS u_id,
             u.name AS u_name,