Merge branch 'dev_cr' into dev

zhuo

2025-03-04 a3d51976f721767c14e231d42abbb7fc970f8de5

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

@@ -49,7 +49,7 @@
    </select>

    <!-- 获取当前登录用户信息 -->
    <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
    <select id="getUserNow" resultType="com.ruoyi.system.domain.vo.UserVo">
        select u.id,
               c.company,
               u.name,