Merge remote-tracking branch 'origin/dev' into dev

ruoyi-generator/src/main/resources/mapper/community/CommunityArticleCommentMapper.xml

@@ -13,7 +13,7 @@
                       where a.article_id = #{articleId}
                         and b.is_delete != 1) as replyCount
               from community_article_comment c
-              where c.article_id = #{articleId}) as d
+              where c.article_id = #{articleId} and  c.is_delete != 1 ) as d
     </select>
 
     <select id="queryCommentReplyCount" resultType="java.lang.Integer">