Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml

@@ -60,4 +60,7 @@
                 left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>
    <select id="selectUserInfo" resultType="com.ruoyi.common.core.vo.SysUserVO">
        select * from user
    </select>
</mapper>