Skip to content

Commit 59d623e

Browse files
committed
Merge remote-tracking branch 'origin/feat/14' into feat/14
2 parents de06a61 + a3bad3f commit 59d623e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

backend/src/main/java/io/f1/backend/domain/quiz/entity/Quiz.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
import jakarta.persistence.ManyToOne;
1717
import jakarta.persistence.OneToMany;
1818

19-
import java.util.ArrayList;
20-
import java.util.List;
2119
import lombok.Getter;
2220
import lombok.Setter;
2321

22+
import java.util.ArrayList;
23+
import java.util.List;
24+
2425
@Getter
2526
@Setter // quizService의 퀴즈 조회 메서드 구현 시까지 임시 사용
2627
@Entity

backend/src/main/java/io/f1/backend/domain/user/entity/User.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
import jakarta.persistence.OneToOne;
1313
import jakarta.persistence.Table;
1414

15-
import java.time.LocalDateTime;
1615
import lombok.Getter;
1716
import lombok.Setter;
1817

18+
import java.time.LocalDateTime;
19+
1920
@Getter
2021
@Setter // quizService의 퀴즈 조회 메서드 구현 시까지 임시 사용
2122
@Entity

0 commit comments

Comments
 (0)