Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/chatrgc/mapper/ChatgroupcMapper.xml

@@ -23,10 +23,12 @@
    <!--群消息-->
    <select id="selectList" resultType="java.util.HashMap">
        SELECT
            c.id,
            c.post_message,
            c.message_type,
            c.post_time,
            c.group_id,
            c.sender_id,
            u.real_name,
            u.avatar,
            us.real_name AS groudname,
@@ -36,7 +38,7 @@
                LEFT JOIN blade_user u ON c.sender_id = u.id
                LEFT JOIN blade_user us ON c.group_id = us.id
        WHERE c.gid=#{gid}
        WHERE c.gid=#{gid}
        order by c.post_time desc
    </select>

</mapper>