From 850edd78f6c0841c8494750d08532b5837003f44 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 十二月 2024 09:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/resources/mapping/SecUserMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/resources/mapping/SecUserMapper.xml b/manage/src/main/resources/mapping/SecUserMapper.xml
index d2c2927..657452b 100644
--- a/manage/src/main/resources/mapping/SecUserMapper.xml
+++ b/manage/src/main/resources/mapping/SecUserMapper.xml
@@ -69,12 +69,14 @@
su.`password`,
su.phone,
su.state,
- su.roleType,
+ su.userType,
su.last_login_time AS lastLoginTime, su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address,
- su.birthday, su.gender,sr.id AS roleId,sr.rolename AS rolename,su.deptId,su.userType,su.provinceCode, su.cityCode, su.areaCode,su.pictures
+ su.birthday, su.gender,sr.id AS roleId,sr.rolename AS rolename,su.deptId,su.userType,su.provinceCode, su.cityCode, su.areaCode,su.pictures,
+ s.name AS storeName
FROM sec_user su
LEFT JOIN sec_user_role sur ON su.id = sur.user_id
LEFT JOIN sec_role sr ON sur.role_id = sr.id
+ LEFT JOIN t_store s ON su.storeId = s.id
<where>
<if test="dto.nickName != null and dto.nickName != ''">
AND su.nick_name LIKE concat('%', #{dto.nickName,jdbcType=VARCHAR}, '%')
--
Gitblit v1.7.1