From ce06cb3e8167151290d68b76b3684ec49e8f31a4 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 17:04:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zt/core/src/main/resources/mapper/sys/SysUserDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
index 7297c62..e275c3c 100644
--- a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
@@ -242,8 +242,8 @@
)
)
</select>
- <select id="getUsersList" resultType="java.lang.String">
- select nick_name from sys_user
+ <select id="getUsersList" resultType="com.zt.core.sys.model.SysUser">
+ select nick_name as name,user_id as id from sys_user
</select>
<update id="updatePassword">
--
Gitblit v1.9.1