From 38f6c4acff6872064b87cadc9d365cdd112f8b4c Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 28 Apr 2025 10:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5nickName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/canteen/core/android/vo/UserInfoVo.java     | 1 +
 .../src/main/resources/mapper/android/UserMapper.xml           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java
index 2097350..50a07cf 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java
@@ -12,6 +12,7 @@ public class UserInfoVo {
     private String userId;
 
     private String userName;
+    private String nickName;
 
     private String phone;
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
index f88e3f3..c0b9186 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
@@ -6,7 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getUserInfo" resultType="com.bonus.canteen.core.android.vo.UserInfoVo">
         select
             su.user_id as userId,
-            su.nick_name as userName,
+            su.user_name as userName,
+            su.nick_name as nickName,
             ac.acc_id as accId,
             ac.card_num as cardNum,
             ac.serial_num as serialNum,