[fix]: conflict 해결

core/src/main/java/dev/hooon/show/infrastructure/adaptor/SeatRepositoryAdaptor.java

@@ -25,4 +25,4 @@ public void saveAll(Iterable<Seat> seats) {
 	public List<SeatDateRoundDto> findSeatDateRoundInfoByShowId(Long showId) {
 		return seatJpaRepository.findSeatDateRoundInfoByShowId(showId);
 	}
-}
+}

core/src/main/java/dev/hooon/show/infrastructure/repository/SeatJpaRepository.java

@@ -1,13 +1,21 @@
-package dev.hooon.show.domain.repository;
+package dev.hooon.show.infrastructure.repository;
 
 import java.util.List;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
 import dev.hooon.show.domain.entity.seat.Seat;
 import dev.hooon.show.dto.query.SeatDateRoundDto;
 
-public interface SeatRepository {
-
-	void saveAll(Iterable<Seat> seats);
+public interface SeatJpaRepository extends JpaRepository<Seat, Long> {
 
+	@Query("""
+		select distinct
+		new dev.hooon.show.dto.query.SeatDateRoundDto(s.showDate, s.showRound.round, s.showRound.startTime)
+		from Seat s
+		where s.show.id = :showId
+		order by s.showDate, s.showRound.round
+		""")
 	List<SeatDateRoundDto> findSeatDateRoundInfoByShowId(Long showId);
 }