fix: 修改代码冲突
This commit is contained in:
parent
c610ecbf82
commit
d882cc1997
@ -165,10 +165,6 @@ public class commentController {
|
|||||||
comment.setContent(content);
|
comment.setContent(content);
|
||||||
comment.setUserId(loginUser.getId());
|
comment.setUserId(loginUser.getId());
|
||||||
comment.setIsDelete(0);
|
comment.setIsDelete(0);
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 30b5de2 (fix 修改)
|
|
||||||
|
|
||||||
// 6. 保存评论
|
// 6. 保存评论
|
||||||
boolean result = commentService.save(comment);
|
boolean result = commentService.save(comment);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user