Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-18 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d

 user-server/src/main/resources/mapper/UserMapper.xml

@@ -39,4 +39,9 @@
        from user
        where state = 1
    </select>
    <select id="getCustom" resultType="com.yuanchu.mom.pojo.User">
        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>
</mapper>