From ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 04 六月 2024 11:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/resources/mapper/UserMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index aab2024..3a9e863 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -40,7 +40,7 @@
         where state = 1
     </select>
     <select id="getCustom" resultType="com.yuanchu.mom.pojo.User">
-        select u.id,c.company,u.name,c.code,u.phone from user u
+        select u.id,c.company,u.name,c.code,u.phone,c.id departId from user u
         left join custom c on u.company = c.id
         where u.id = #{userId}
     </select>

--
Gitblit v1.9.3