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

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

@@ -25,7 +25,7 @@
         WHERE a.user_id = #{userId}
         AND (a.is_delete != '1' OR a.is_delete IS NULL)
         AND (b.is_delete != '1' OR b.is_delete IS NULL)
-        AND (c.is_delete != '1' OR c.is_delete IS NULL)   AND (c.is_draft != '1' OR c.is_draft IS NULL)
+        AND (c.is_delete != '1' OR c.is_delete IS NULL)
         <if test="articleId != null and articleId != ''">
             AND b.article_id = #{articleId}
         </if>