From c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 10:31:42 +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