refactor: #15 conflict 해결 미반영사항 반영

Leets-Official · Nov 8, 2024 · 8cc4f47 · 8cc4f47
1 parent 96ee630
commit 8cc4f47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/main/java/com/leets/xcellentbe/domain/article/dto/ArticlesResponseDto.java b/src/main/java/com/leets/xcellentbe/domain/article/dto/ArticlesResponseDto.java
@@ -35,9 +35,8 @@ public static ArticlesResponseDto of(Article article, List<String> filePath) {
 		return ArticlesResponseDto.builder()
 			.writer(article.getWriter().getUserName())
 			.content(article.getContent())
-			.isPinned(article.getIsPinned())
 			.hashtags(article.getHashtags())
-			.rePost(article.getReArticle())
+			.rePost(article.getRePost())
 			.filePath(filePath)
 			.build();
 	}

diff --git a/src/main/java/com/leets/xcellentbe/domain/comment/domain/Comment.java b/src/main/java/com/leets/xcellentbe/domain/comment/domain/Comment.java
@@ -40,11 +40,7 @@ public class Comment extends BaseTimeEntity {
 	@NotNull
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "post_id")
-<<<<<<< HEAD
-	private Article article;
-=======
 	private Article post;
->>>>>>> develop
 
 	@NotNull
 	@Column