Merge remote-tracking branch 'origin/master'

zss

2024-07-26 ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e

 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>