fix: resolve ArticleService.java merge conflict (autoGenerateTags + submitForReview/withdraw/reDraft)

cfc-backend/src/main/java/com/etotem/cfc/service/ArticleService.java

@@ -691,7 +691,6 @@ public class ArticleService {
         articleMapper.updateById(article);
     }
 
-<<<<<<< Updated upstream
     /**
      * 调用 Dify AI 从文章内容中自动提取 3-5 个中文关键词作为标签
      */
@@ -780,7 +779,8 @@ public class ArticleService {
             String tagsStr = String.join(",", savedTags);
             jdbcTemplate.update("UPDATE articles SET tags = ? WHERE id = ?", tagsStr, articleId);
         }
-=======
+    }
+
     @Transactional
     public void submitForReview(Long id) {
         Article article = articleMapper.selectById(id);
@@ -826,6 +826,5 @@ public class ArticleService {
         article.setAuditedAt(null);
         article.setUpdatedAt(new Date());
         articleMapper.updateById(article);
->>>>>>> Stashed changes
     }
 }