diff --git a/src/main/java/com/yupi/springbootinit/controller/commentController.java b/src/main/java/com/yupi/springbootinit/controller/commentController.java
index 7958fe1..c6340d6 100644
--- a/src/main/java/com/yupi/springbootinit/controller/commentController.java
+++ b/src/main/java/com/yupi/springbootinit/controller/commentController.java
@@ -165,15 +165,11 @@ public class commentController {
         comment.setContent(content);
         comment.setUserId(loginUser.getId());
         comment.setIsDelete(0);
-<<<<<<< HEAD
-
-=======
->>>>>>> 30b5de2 (fix 修改)
 
         // 6. 保存评论
         boolean result = commentService.save(comment);
         if (!result) {
-            throw new BusinessException(ErrorCode.SYSTEM_ERROR, "评论发布失败");
+            throw new BusinessException(Erro rCode.SYSTEM_ERROR, "评论发布失败");
         }