Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8

 src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml

@@ -51,7 +51,7 @@
            <if test="userTopics.updateTime != null ">and jut.update_time = #{userTopics.updateTime}</if>
            <if test="userTopics.deleteFlag != null ">and jut.delete_flag = #{userTopics.deleteFlag}</if>
            <if test="userTopics.articleId != null ">and jut.article_id = #{userTopics.articleId}
                GROUP BY jut.article_id,
                GROUP BY jut.article_id, jut.signature_path,
                bu.avatar,
                bu.`name`,
                bu.phone,