Merge remote-tracking branch 'origin/feat/#12' into feat/#12

woals2840 · woals2840 · commit b7f68d1c63d9 · 2025-05-18T04:36:42.000+09:00
# Conflicts:
#	src/main/java/com/sopkathon/domain/subway/repository/SubwayRepository.java
diff --git a/src/main/java/com/sopkathon/domain/subway/service/SubwayService.java b/src/main/java/com/sopkathon/domain/subway/service/SubwayService.java
@@ -40,4 +40,8 @@ public SubwayListRes getSubwayListByKeyword(String keyword) {
     public SubwayEntity getSubwayEntity(String subwayName) {
         return subwayRepository.findBySubwayName(subwayName);
     }
+
+    public SubwayEntity getSubwayEntity(String subwayName) {
+        return subwayRepository.findBySubwayName(subwayName);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,8 @@ public SubwayListRes getSubwayListByKeyword(String keyword) {`
`40`	`40`	`public SubwayEntity getSubwayEntity(String subwayName) {`
`41`	`41`	`return subwayRepository.findBySubwayName(subwayName);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ public SubwayEntity getSubwayEntity(String subwayName) {`
	`45`	`+ return subwayRepository.findBySubwayName(subwayName);`
	`46`	`+ }`
`43`	`47`	`}`