fix: 修改代码冲突

2025-05-19 04:25:11 +08:00 · 2025-05-19 04:25:11 +08:00 · d882cc1997
commit d882cc1997
parent c610ecbf82
1 changed files with 1 additions and 5 deletions
--- a/src/main/java/com/yupi/springbootinit/controller/commentController.java
+++ b/src/main/java/com/yupi/springbootinit/controller/commentController.java
@ -165,10 +165,6 @@ public class commentController {
        comment.setContent(content);
        comment.setUserId(loginUser.getId());
        comment.setIsDelete(0);
-<<<<<<< HEAD
-
-=======
->>>>>>> 30b5de2 (fix 修改)

        // 6. 保存评论
        boolean result = commentService.save(comment);