fix(#30) : 병합 충돌 해결

EnjoyTripKorea · May 23, 2024 · 594a296 · 594a296
2 parents d77da38 + e193fb9
commit 594a296
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/...pBackend/src/main/java/com/example/EnjoyTripBackend/dto/airplane/AirplaneResponseDto.java b/...pBackend/src/main/java/com/example/EnjoyTripBackend/dto/airplane/AirplaneResponseDto.java
@@ -17,4 +17,5 @@ public class AirplaneResponseDto {
     private String economyCharge;
     private String prestigeCharge;
     private String vihicleId;
+    private String img;
 }
diff --git a/EnjoyTripBackend/src/main/java/com/example/EnjoyTripBackend/dto/notice/NoticeDto.java b/EnjoyTripBackend/src/main/java/com/example/EnjoyTripBackend/dto/notice/NoticeDto.java
@@ -19,4 +19,6 @@ public class NoticeDto {
     @NotEmpty
     private String content;
 
+    private String createdDate;
+
 }
diff --git a/EnjoyTripBackend/src/main/java/com/example/EnjoyTripBackend/util/DataUpdater.java b/EnjoyTripBackend/src/main/java/com/example/EnjoyTripBackend/util/DataUpdater.java