From d882cc1997eedf93b3b218b59641435e23828d2e Mon Sep 17 00:00:00 2001
From: sunhe <1279224279@qq.com>
Date: Mon, 19 May 2025 04:25:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yupi/springbootinit/controller/commentController.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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, "评论发布失败");
         }