Merge remote-tracking branch 'origin/dev'

xiangpei

2024-07-09 c2cd507da74f1841d0133d4c9bff9025ce1066ba

 src/main/resources/mapper/FeedbackMapper.xml

@@ -26,7 +26,8 @@
               c.real_name as userName
        from t_feedback a
                 left join t_text_content b on a.content_id = b.id
                 left join t_user c on a.user_id = c.id and deleted = 0
                 left join t_user c on a.user_id = c.id and c.deleted = 0
        where a.deleted = 0
        order by id desc
    </select>
</mapper>