Merge branch 'refs/heads/main' into feature/184

urinaner · Dec 21, 2024 · d063192 · d063192
2 parents d0402a0 + 84f8047
commit d063192
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/src/main/java/org/example/backend/board/domain/dto/BoardResDto.java b/backend/src/main/java/org/example/backend/board/domain/dto/BoardResDto.java
@@ -41,7 +41,7 @@ public static BoardResDto of(Board board) {
                 .content(board.getContent())
                 .writer(board.getWriter())
                 .fileList(board.getFileList())
-                .createDate(TimeParsingUtils.toRelativeTimeFormat(board.getCreatedDateTime()))
+                .createDate(TimeParsingUtils.toRelativeTimeFormat(board.getCreatedDate()))
                 .viewCount(board.getViewCount())
                 .category(board.getCategory().name())
                 .build();

diff --git a/backend/src/main/java/org/example/backend/board/domain/entity/Board.java b/backend/src/main/java/org/example/backend/board/domain/entity/Board.java
@@ -38,7 +38,7 @@ public class Board extends BaseEntity {
     private List<String> fileList;
 
     @Column(name = "created_date")
-    private LocalDateTime createdDateTime;
+    private LocalDateTime createdDate;
 
     @Enumerated(EnumType.STRING)
     @Column(name = "category")