Merge remote-tracking branch 'origin/master'

zss

2024-07-23 c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2

 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>