Merge remote-tracking branch 'origin/master'

zss

2024-07-30 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98

 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>