fix: 修改代码冲突
This commit is contained in:
parent
c610ecbf82
commit
d882cc1997
@ -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, "评论发布失败");
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user