Merge branch 'dev_cr' into dev

zhuo

2025-03-06 7baabc20800670388eeb074c12868b8ec8ec139d

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

@@ -13,4 +13,14 @@
        </if>
        order by i.create_time desc
    </select>

    <select id="msgRoll" resultType="com.ruoyi.common.core.domain.entity.InformationNotificationDto">
        select i.*, u.name senderUser, u2.name consigneeUser
        from information_notification i
        left join user u on i.sender_id = u.id
        left join user u2 on u2.id = i.consignee_id
        where i.consignee_id = #{userId}
        order by i.create_time desc
    </select>

</mapper>