diff --git a/pom.xml b/pom.xml
index ed7cadc..8b2fdfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,6 @@
     </dependencies>
 
     <build>
-        <finalName>qure</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/app/snapshot/qure/config/AwsConfig.java b/src/main/java/app/snapshot/qure/config/AwsConfig.java
index 979e409..8a4c289 100644
--- a/src/main/java/app/snapshot/qure/config/AwsConfig.java
+++ b/src/main/java/app/snapshot/qure/config/AwsConfig.java
@@ -5,13 +5,12 @@
 import org.springframework.context.annotation.*;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 
 @Configuration
-@PropertySource("classpath:application-db.properties") // 여길 읽게 함
+@PropertySource("classpath:application.properties") // 여길 읽게 함
 public class AwsConfig {
 
   // 서블릿 컨텍스트에도 플레이스홀더 해석기를 등록
diff --git a/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesApiController.java b/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesApiController.java
index 591e873..96fb619 100644
--- a/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesApiController.java
+++ b/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesApiController.java
@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
+// 작성자: 김민서
 @RestController
 @RequestMapping("/api/facilities")
 public class FacilitiesApiController {
diff --git a/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesController.java b/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesController.java
index ec4e141..874f9c9 100644
--- a/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesController.java
+++ b/src/main/java/app/snapshot/qure/facilities/controller/FacilitiesController.java
@@ -16,6 +16,8 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+
+// 작성자: 김민서
 @Controller
 @RequestMapping("/facilities")
 public class FacilitiesController {
@@ -31,9 +33,6 @@ public FacilitiesController(IFacilitiesService facilitiesService,
     }
 
 
-    // 목록 + 검색
-    // FacilitiesController.java
-
     // 목록 + 검색 + 페이지네이션
     @GetMapping
     public String list(@RequestParam(value = "q", required = false) String q,
@@ -146,7 +145,6 @@ public String create(@ModelAttribute FacilitiesDto dto,
         return "redirect:/facilities/" + facilityId + "/qr";
     }
 
-// ========== 유틸 ==========
 
     // dto.address에서 "도로명+번지" 핵심만 추출 (예: "서울특별시 종로구 창경궁로 254 55" → "서울특별시 종로구 창경궁로 254")
     private static String extractRoadCore(String s) {
@@ -258,7 +256,7 @@ public String editForm(@PathVariable("facilityId") Long facilityId,
             return "redirect:/facilities";
         }
 
-        // ★ 설비에 연결된 템플릿 조회 → 모델에 넣기
+        // 설비에 연결된 템플릿 조회 → 모델에 넣기
         var attached = facilitiesService.findTemplatesByFacilityIdAndManager(facilityId, managerId);
         model.addAttribute("facility", facility);
         model.addAttribute("attachedTemplates", attached); // ← JSP는 이것만 사용
@@ -338,24 +336,12 @@ public String edit(@PathVariable("id") Long facilityId,
                 facilitiesService.updateFacilityTemplates(facilityId, removedIds, addedIds, managerId);
                 System.out.println("점검표 변경 처리 - 삭제: " + removedIds + ", 추가: " + addedIds);
             }
-
-        /* 또는 전체 교체 방식 (더 단순하지만 덜 효율적)
-        if (facility.getTemplateIds() != null && !facility.getTemplateIds().isBlank()) {
-            facilitiesService.replaceAllFacilityTemplates(
-                    facilityId,
-                    parseIds(facility.getTemplateIds()),
-                    managerId
-            );
-        } else {
-            // 모든 점검표 연결 해제
-            facilitiesService.replaceAllFacilityTemplates(facilityId, new ArrayList<>(), managerId);
-        }
-        */
         }
 
         ra.addFlashAttribute("msg", rows > 0 ? "설비가 수정되었습니다." : "수정 권한이 없거나 실패했습니다.");
         return "redirect:/facilities/" + facilityId;
     }
+
     @PostMapping("/{facilityId}/delete")
     public String delete(@PathVariable Long facilityId, RedirectAttributes ra, HttpSession session) {
         Long managerId = SessionUtil.mustManagerId(session);
diff --git a/src/main/java/app/snapshot/qure/facilities/controller/FacilitySummaryApiController.java b/src/main/java/app/snapshot/qure/facilities/controller/FacilitySummaryApiController.java
index 88ae779..5782055 100644
--- a/src/main/java/app/snapshot/qure/facilities/controller/FacilitySummaryApiController.java
+++ b/src/main/java/app/snapshot/qure/facilities/controller/FacilitySummaryApiController.java
@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+// 작성자: 김민서
 @RestController
 @RequestMapping("/api/facilities")
 public class FacilitySummaryApiController {
diff --git a/src/main/java/app/snapshot/qure/facilities/controller/MapController.java b/src/main/java/app/snapshot/qure/facilities/controller/MapController.java
index 239647d..0fd8f7c 100644
--- a/src/main/java/app/snapshot/qure/facilities/controller/MapController.java
+++ b/src/main/java/app/snapshot/qure/facilities/controller/MapController.java
@@ -5,6 +5,7 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+// 작성자: 김민서
 @Controller
 public class MapController {
 
@@ -17,6 +18,6 @@ public MapController(MapService mapService) {
     @GetMapping("/map")
     public String addForm(Model model) {
         model.addAttribute("kakaoAppKey", mapService.getKakaoAppKey());
-        return "facilities/map"; // /WEB-INF/views/facilities/map.jsp
+        return "facilities/map";
     }
 }
diff --git a/src/main/java/app/snapshot/qure/facilities/controller/PopupController.java b/src/main/java/app/snapshot/qure/facilities/controller/PopupController.java
index 30e378f..4aa4638 100644
--- a/src/main/java/app/snapshot/qure/facilities/controller/PopupController.java
+++ b/src/main/java/app/snapshot/qure/facilities/controller/PopupController.java
@@ -5,13 +5,13 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-// PopupController.java
+// 작성자: 김민서
 @Controller
 @RequestMapping("/popup")
 public class PopupController {
     @GetMapping("/juso")
     public String jusoPopup() {
-        return "facilities/jusoPopup"; // /WEB-INF/views/popup/jusoPopup.jsp
+        return "facilities/jusoPopup";
     }
 
     // JUSO에서 결과를 POST로 되돌려줄 때도 같은 뷰로 렌더
diff --git a/src/main/java/app/snapshot/qure/facilities/controller/QrController.java b/src/main/java/app/snapshot/qure/facilities/controller/QrController.java
index 5631a2b..30d0cad 100644
--- a/src/main/java/app/snapshot/qure/facilities/controller/QrController.java
+++ b/src/main/java/app/snapshot/qure/facilities/controller/QrController.java
@@ -13,6 +13,7 @@
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 
+// 작성자: 김민서
 @Controller
 @RequiredArgsConstructor
 public class QrController {
diff --git a/src/main/java/app/snapshot/qure/facilities/dto/ChecklistTemplateDto.java b/src/main/java/app/snapshot/qure/facilities/dto/ChecklistTemplateDto.java
index c9efd87..a409815 100644
--- a/src/main/java/app/snapshot/qure/facilities/dto/ChecklistTemplateDto.java
+++ b/src/main/java/app/snapshot/qure/facilities/dto/ChecklistTemplateDto.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+// 작성자: 김민서
 @Data
 public class ChecklistTemplateDto {
 
diff --git a/src/main/java/app/snapshot/qure/facilities/dto/FacilitiesDto.java b/src/main/java/app/snapshot/qure/facilities/dto/FacilitiesDto.java
index a4fb87b..6705d03 100644
--- a/src/main/java/app/snapshot/qure/facilities/dto/FacilitiesDto.java
+++ b/src/main/java/app/snapshot/qure/facilities/dto/FacilitiesDto.java
@@ -4,6 +4,7 @@
 
 import java.util.Date;
 
+// 작성자: 김민서
 @Data
 public class FacilitiesDto {
 	private Long facilityId;
diff --git a/src/main/java/app/snapshot/qure/facilities/dto/FacilityMarkerDto.java b/src/main/java/app/snapshot/qure/facilities/dto/FacilityMarkerDto.java
index 7f00f85..a114190 100644
--- a/src/main/java/app/snapshot/qure/facilities/dto/FacilityMarkerDto.java
+++ b/src/main/java/app/snapshot/qure/facilities/dto/FacilityMarkerDto.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+// 작성자: 김민서
 @Data
 public class FacilityMarkerDto {
     private Long facilityId;
diff --git a/src/main/java/app/snapshot/qure/facilities/dto/FacilitySummaryDto.java b/src/main/java/app/snapshot/qure/facilities/dto/FacilitySummaryDto.java
index 9b70d74..90a0556 100644
--- a/src/main/java/app/snapshot/qure/facilities/dto/FacilitySummaryDto.java
+++ b/src/main/java/app/snapshot/qure/facilities/dto/FacilitySummaryDto.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 
+// 작성자: 김민서
 @Data
 public class FacilitySummaryDto {
     private Long facilityId;
diff --git a/src/main/java/app/snapshot/qure/facilities/dto/FacilityTagDto.java b/src/main/java/app/snapshot/qure/facilities/dto/FacilityTagDto.java
index 036daeb..06f7115 100644
--- a/src/main/java/app/snapshot/qure/facilities/dto/FacilityTagDto.java
+++ b/src/main/java/app/snapshot/qure/facilities/dto/FacilityTagDto.java
@@ -3,6 +3,7 @@
 import java.sql.Timestamp;
 import lombok.Data;
 
+// 작성자: 김민서
 @Data
 public class FacilityTagDto {
     private Long tagId;
diff --git a/src/main/java/app/snapshot/qure/facilities/dto/InspectionDto.java b/src/main/java/app/snapshot/qure/facilities/dto/InspectionDto.java
index 2ac34de..c7e6b08 100644
--- a/src/main/java/app/snapshot/qure/facilities/dto/InspectionDto.java
+++ b/src/main/java/app/snapshot/qure/facilities/dto/InspectionDto.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+// 작성자: 김민서
 @Data
 public class InspectionDto {
     private Long inspectionId;
diff --git a/src/main/java/app/snapshot/qure/facilities/repository/IFacilitiesRepository.java b/src/main/java/app/snapshot/qure/facilities/repository/IFacilitiesRepository.java
index cdfcb2c..eef6f4a 100644
--- a/src/main/java/app/snapshot/qure/facilities/repository/IFacilitiesRepository.java
+++ b/src/main/java/app/snapshot/qure/facilities/repository/IFacilitiesRepository.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
+// 작성자: 김민서
 @Mapper
 public interface IFacilitiesRepository {
     List<FacilitiesDto> getFacilitiesListByManager(@Param("managerId") Long managerId);
diff --git a/src/main/java/app/snapshot/qure/facilities/repository/IFacilitySummaryRepository.java b/src/main/java/app/snapshot/qure/facilities/repository/IFacilitySummaryRepository.java
index 637ccab..f3c00a6 100644
--- a/src/main/java/app/snapshot/qure/facilities/repository/IFacilitySummaryRepository.java
+++ b/src/main/java/app/snapshot/qure/facilities/repository/IFacilitySummaryRepository.java
@@ -3,6 +3,7 @@
 import app.snapshot.qure.facilities.dto.FacilitySummaryDto;
 import org.apache.ibatis.annotations.Param;
 
+// 작성자: 김민서
 public interface IFacilitySummaryRepository {
     FacilitySummaryDto findSummaryByFacilityId(@Param("facilityId") Long facilityId);
 
diff --git a/src/main/java/app/snapshot/qure/facilities/repository/IFacilityTagRepository.java b/src/main/java/app/snapshot/qure/facilities/repository/IFacilityTagRepository.java
index 6898a52..2edf2ec 100644
--- a/src/main/java/app/snapshot/qure/facilities/repository/IFacilityTagRepository.java
+++ b/src/main/java/app/snapshot/qure/facilities/repository/IFacilityTagRepository.java
@@ -1,6 +1,7 @@
 package app.snapshot.qure.facilities.repository;
 import app.snapshot.qure.facilities.dto.FacilityTagDto;
 
+// 작성자: 김민서
 public interface IFacilityTagRepository {
     Long  getNextTagId();
     int  insertFacilityTagWithGivenId(FacilityTagDto tag);
diff --git a/src/main/java/app/snapshot/qure/facilities/service/FacilitiesService.java b/src/main/java/app/snapshot/qure/facilities/service/FacilitiesService.java
index 616e371..c9091e2 100644
--- a/src/main/java/app/snapshot/qure/facilities/service/FacilitiesService.java
+++ b/src/main/java/app/snapshot/qure/facilities/service/FacilitiesService.java
@@ -14,6 +14,7 @@
 
 import app.snapshot.qure.facilities.repository.IFacilitiesRepository;
 
+// 작성자: 김민서
 @Service
 public class FacilitiesService implements IFacilitiesService {
 
@@ -24,7 +25,7 @@ public class FacilitiesService implements IFacilitiesService {
     IFacilityTagRepository facilityTagRepository;
 
     @Autowired
-    GeocodingService geocodingService; // ← 주소→좌표 변환용 주입
+    GeocodingService geocodingService; // 주소→좌표 변환용 주입
 
 
     @Value("${app.public-domain}")
@@ -118,7 +119,7 @@ public Long createFacilityWithQr(FacilitiesDto dto, Long managerId) {
         FacilityTagDto tag = new FacilityTagDto();
         tag.setTagId(nextTagId);
         tag.setFacilityId(dto.getFacilityId());
-        tag.setCode(publicDomain + "/mobile/main/" + nextTagId);
+        tag.setCode(publicDomain + "qure/mobile/main/" + nextTagId);
 
         facilityTagRepository.insertFacilityTagWithGivenId(tag);
         return dto.getFacilityId();
diff --git a/src/main/java/app/snapshot/qure/facilities/service/FacilitySummaryService.java b/src/main/java/app/snapshot/qure/facilities/service/FacilitySummaryService.java
index 2a53056..e28dee7 100644
--- a/src/main/java/app/snapshot/qure/facilities/service/FacilitySummaryService.java
+++ b/src/main/java/app/snapshot/qure/facilities/service/FacilitySummaryService.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+// 작성자: 김민서
 @Service
 public class FacilitySummaryService {
     @Autowired
diff --git a/src/main/java/app/snapshot/qure/facilities/service/GeocodingService.java b/src/main/java/app/snapshot/qure/facilities/service/GeocodingService.java
index a23710f..2772734 100644
--- a/src/main/java/app/snapshot/qure/facilities/service/GeocodingService.java
+++ b/src/main/java/app/snapshot/qure/facilities/service/GeocodingService.java
@@ -10,6 +10,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+// 작성자: 김민서
 @Service
 public class GeocodingService {
 
diff --git a/src/main/java/app/snapshot/qure/facilities/service/IFacilitiesService.java b/src/main/java/app/snapshot/qure/facilities/service/IFacilitiesService.java
index 195ad2e..cd4447c 100644
--- a/src/main/java/app/snapshot/qure/facilities/service/IFacilitiesService.java
+++ b/src/main/java/app/snapshot/qure/facilities/service/IFacilitiesService.java
@@ -7,6 +7,7 @@
 import app.snapshot.qure.facilities.dto.FacilityTagDto;
 import app.snapshot.qure.facilities.dto.InspectionDto;
 
+// 작성자: 김민서
 public interface IFacilitiesService {
 
     /* 목록/검색: 로그인한 관리자 소유만 */
diff --git a/src/main/java/app/snapshot/qure/facilities/service/MapService.java b/src/main/java/app/snapshot/qure/facilities/service/MapService.java
index 99af597..9121714 100644
--- a/src/main/java/app/snapshot/qure/facilities/service/MapService.java
+++ b/src/main/java/app/snapshot/qure/facilities/service/MapService.java
@@ -5,6 +5,7 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 
+// 작성자: 김민서
 @Getter
 @Service
 @PropertySource("classpath:application-map.properties")
@@ -16,7 +17,4 @@ public MapService(@Value("${kakao.app.key}") String kakaoAppKey, @Value("${kakao
         this.kakaoAppKey = kakaoAppKey;
         this.kakaoApiKey = kakaoApiKey;
     }
-
-
-
 }
diff --git a/src/main/java/app/snapshot/qure/login/controller/LoginController.java b/src/main/java/app/snapshot/qure/login/controller/LoginController.java
index 58e2345..8dbc5c9 100644
--- a/src/main/java/app/snapshot/qure/login/controller/LoginController.java
+++ b/src/main/java/app/snapshot/qure/login/controller/LoginController.java
@@ -1,5 +1,6 @@
 package app.snapshot.qure.login.controller;
 // 작성자 : 구희원
+// 세션 관련 작성자: 김민서
 import app.snapshot.qure.login.dto.ManagerDTO;
 import app.snapshot.qure.login.service.ManagerService;
 import app.snapshot.qure.login.util.SessionUtil;
diff --git a/src/main/java/app/snapshot/qure/login/util/SessionUtil.java b/src/main/java/app/snapshot/qure/login/util/SessionUtil.java
index ddd918f..fa7acee 100644
--- a/src/main/java/app/snapshot/qure/login/util/SessionUtil.java
+++ b/src/main/java/app/snapshot/qure/login/util/SessionUtil.java
@@ -2,6 +2,7 @@
 
 import jakarta.servlet.http.HttpSession;
 
+// 작성자: 김민서
 public class SessionUtil {
 
     public static final String LOGIN_MANAGER_ID = "LOGIN_MANAGER_ID";
diff --git a/src/main/java/app/snapshot/qure/template/controller/TemplateController.java b/src/main/java/app/snapshot/qure/template/controller/TemplateController.java
index af30e34..d433244 100644
--- a/src/main/java/app/snapshot/qure/template/controller/TemplateController.java
+++ b/src/main/java/app/snapshot/qure/template/controller/TemplateController.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 
+// 팝업 관련 작성자: 김민서
 @Slf4j
 @Controller
 @RequestMapping("/template")
diff --git a/src/main/resources/config/mybatis/root-context.xml b/src/main/resources/config/mybatis/root-context.xml
index 6fc4545..e251aee 100644
--- a/src/main/resources/config/mybatis/root-context.xml
+++ b/src/main/resources/config/mybatis/root-context.xml
@@ -9,7 +9,7 @@
          http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
     <context:property-placeholder
-            location="classpath:application-db.properties,classpath:application-map.properties"
+            location="classpath:application.properties,classpath:application-map.properties"
             ignore-unresolvable="true"/>
 
 
@@ -20,10 +20,10 @@
 
     <!-- DataSource -->
     <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${db.driver:oracle.jdbc.OracleDriver}"/>
-        <property name="url"             value="${db.url}"/>
-        <property name="username"        value="${db.user}"/>
-        <property name="password"        value="${db.pass}"/>
+        <property name="driverClassName" value="${spring.datasource.driver-class-name:oracle.jdbc.OracleDriver}"/>
+        <property name="url"             value="${spring.datasource.url}"/>
+        <property name="username"        value="${spring.datasource.username}"/>
+        <property name="password"        value="${spring.datasource.password}"/>
     </bean>
 
     <!-- MyBatis -->
diff --git a/src/main/resources/mappers/FacilitiesMapper.xml b/src/main/resources/mappers/FacilitiesMapper.xml
index b4c3b67..2092b65 100644
--- a/src/main/resources/mappers/FacilitiesMapper.xml
+++ b/src/main/resources/mappers/FacilitiesMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+<!-- 작성자 : 김민서 -->
 <mapper namespace="app.snapshot.qure.facilities.repository.IFacilitiesRepository">
 
     <!-- Dto 매핑 -->
@@ -348,28 +348,41 @@
 
     <!-- 목록 페이징 -->
     <select id="findFacilitiesPaged" parameterType="map" resultMap="FacilityMap">
+  <![CDATA[
         SELECT *
         FROM (
-        SELECT
-        f.FACILITY_ID,
-        f.NAME,
-        f.DOMAIN,
-        f.ZONE,
-        f.UPDATED_AT,
-        f.NEXT_SCHEDULED_AT,
-        ROW_NUMBER() OVER (ORDER BY f.FACILITY_ID DESC) AS rn
-        FROM FACILITIES f
-        WHERE f.MANAGERS_ID = #{managerId}
-        <if test="q != null and q != ''">
-            AND (
-            LOWER(f.NAME)   LIKE '%' || LOWER(#{q}) || '%'
-            OR LOWER(f.DOMAIN) LIKE '%' || LOWER(#{q}) || '%'
-            OR LOWER(f.ZONE)   LIKE '%' || LOWER(#{q}) || '%'
-            )
-        </if>
-        ) t
+                 SELECT
+                     f.FACILITY_ID,
+                     f.NAME,
+                     f.DOMAIN,
+                     f.ZONE,
+                     f.UPDATED_AT,
+                     f.NEXT_SCHEDULED_AT,
+
+                     CASE
+                         WHEN f.NEXT_SCHEDULED_AT IS NULL THEN 'NONE'
+                         WHEN TRUNC(f.NEXT_SCHEDULED_AT) < TRUNC(NVL(f.UPDATED_AT, SYSDATE)) THEN 'OVERDUE'
+                         ELSE 'UPCOMING'
+                         END AS SCHEDULE_STATUS,
+
+                     CASE
+                         WHEN f.NEXT_SCHEDULED_AT IS NULL THEN NULL
+                         WHEN TRUNC(f.NEXT_SCHEDULED_AT) < TRUNC(NVL(f.UPDATED_AT, SYSDATE))
+                             THEN TRUNC(NVL(f.UPDATED_AT, SYSDATE)) - TRUNC(f.NEXT_SCHEDULED_AT)
+                         ELSE TRUNC(f.NEXT_SCHEDULED_AT) - TRUNC(SYSDATE)
+                         END AS DAYS_DELTA,
+
+                     ROW_NUMBER() OVER (ORDER BY f.FACILITY_ID DESC) AS rn
+                 FROM FACILITIES f
+                 WHERE f.MANAGERS_ID = #{managerId}
+                 /* 검색 조건 */
+                 /* 동적 SQL은 CDATA 밖으로 빼도 되지만 안전하게 넣어도 무방 */
+             ) t
         WHERE t.rn BETWEEN #{startRow} AND #{endRow}
-    </select>
+        ]]>
+</select>
+
+
 
     <!-- 총 개수 -->
     <select id="countFacilities" parameterType="map" resultType="int">
diff --git a/src/main/resources/mappers/FacilitySummaryMapper.xml b/src/main/resources/mappers/FacilitySummaryMapper.xml
index 0020ad9..8378690 100644
--- a/src/main/resources/mappers/FacilitySummaryMapper.xml
+++ b/src/main/resources/mappers/FacilitySummaryMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+<!-- 작성자 : 김민서 -->
 <mapper namespace="app.snapshot.qure.facilities.repository.IFacilitySummaryRepository">
 
     <select id="findSummaryByFacilityId"
diff --git a/src/main/resources/mappers/FacilityTagMapper.xml b/src/main/resources/mappers/FacilityTagMapper.xml
index 36ab4a2..dbb3734 100644
--- a/src/main/resources/mappers/FacilityTagMapper.xml
+++ b/src/main/resources/mappers/FacilityTagMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+<!-- 작성자 : 김민서 -->
 <mapper namespace="app.snapshot.qure.facilities.repository.IFacilityTagRepository">
 
     <!-- 다음 TAG_ID 뽑기 -->
@@ -34,7 +34,7 @@
         WHERE TAG_ID = #{tagId}
     </select>
 
-    <!-- (옵션) 기존 활성 태그를 비활성화할 때 사용 -->
+    <!--  기존 활성 태그를 비활성화할 때 사용 -->
     <update id="deactivateActiveTags" parameterType="Long">
         UPDATE FACILITY_TAGS
         SET ACTIVE='N', REVOKED_AT=SYSTIMESTAMP
diff --git a/src/main/webapp/WEB-INF/assets/css/facilities.css b/src/main/webapp/WEB-INF/assets/css/facilities.css
index 81200c6..d026274 100644
--- a/src/main/webapp/WEB-INF/assets/css/facilities.css
+++ b/src/main/webapp/WEB-INF/assets/css/facilities.css
@@ -1,5 +1,4 @@
-/* /resources/css/facilities.css */
-
+/* 작성자: 김민서 */
 :root{
     --bg:#f6f6f6;
     --panel:#ffffff;
diff --git a/src/main/webapp/WEB-INF/assets/css/facilities_add.css b/src/main/webapp/WEB-INF/assets/css/facilities_add.css
index 1baf4c2..af83bc9 100644
--- a/src/main/webapp/WEB-INF/assets/css/facilities_add.css
+++ b/src/main/webapp/WEB-INF/assets/css/facilities_add.css
@@ -1,6 +1,4 @@
-/* ===================== facilities_add.css ===================== */
-/* 템플릿 CSS 건드리지 않고 facilities 전용으로 통일 */
-
+/* 작성자: 김민서 */
 html, body {
     height: 100%;
     margin: 0;
diff --git a/src/main/webapp/WEB-INF/assets/css/login.css b/src/main/webapp/WEB-INF/assets/css/login.css
index 32f7a33..472e57a 100644
--- a/src/main/webapp/WEB-INF/assets/css/login.css
+++ b/src/main/webapp/WEB-INF/assets/css/login.css
@@ -98,7 +98,6 @@ body {
         transform: scale(1);
         opacity: 0.9;
     }
-    z-index: 0;
 }
 
 .inner-container {
diff --git a/src/main/webapp/WEB-INF/assets/css/map.css b/src/main/webapp/WEB-INF/assets/css/map.css
index 463f9c8..1caadc3 100644
--- a/src/main/webapp/WEB-INF/assets/css/map.css
+++ b/src/main/webapp/WEB-INF/assets/css/map.css
@@ -1,3 +1,4 @@
+/* 작성자: 김민서 */
 /* 레이아웃 */
 .map-container { display:flex; height:100vh; overflow:hidden; }
 
@@ -51,6 +52,7 @@
     border:1px solid #eee;
 }
 .balloon * {
+    width:200px;
     white-space: normal;          /* 한 줄 고정 방지 */
     word-break: break-word;       /* 긴 단어 중간에서도 줄바꿈 */
     overflow-wrap: anywhere;      /* 브라우저가 어디서든 줄바꿈 허용 */
diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities.jsp
index bf6b7a1..0e954cf 100644
--- a/src/main/webapp/WEB-INF/views/facilities/facilities.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/facilities.jsp
@@ -1,6 +1,10 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!-- 작성자: 김민서 -->
+
+%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c"   uri="jakarta.tags.core" %>
 <%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
+
 <!DOCTYPE html>
 <html lang="ko">
 <head>
@@ -92,26 +96,27 @@
                                         <div class="cell col-actions">
                                             <div class="facility-header">
                                                 <c:choose>
-                                                    <c:when test="${f.scheduleStatus == 'OVERDUE'}">
+                                                    <c:when test="${fn:trim(f.scheduleStatus) eq 'OVERDUE'}">
                                                         <span class="badge badge-danger">점검 지연</span>
                                                         <span class="note">
-                                                            <fmt:formatDate value="${f.nextScheduledAt}" pattern="yyyy.MM.dd"/>
-                                                            &nbsp;이후 <strong>${f.daysDelta}</strong>일 경과
-                                                          </span>
+      <fmt:formatDate value="${f.nextScheduledAt}" pattern="yyyy.MM.dd"/>
+      &nbsp;이후 <strong>${f.daysDelta}</strong>일 경과
+    </span>
                                                     </c:when>
 
-                                                    <c:when test="${f.scheduleStatus == 'UPCOMING'}">
+                                                    <c:when test="${fn:trim(f.scheduleStatus) eq 'UPCOMING'}">
                                                         <span class="badge badge-info">다음 점검</span>
                                                         <span class="note">
-                                                            <fmt:formatDate value="${f.nextScheduledAt}" pattern="yyyy.MM.dd"/>
-                                                            &nbsp;(D<c:if test="${f.daysDelta >= 0}">-</c:if>${f.daysDelta})
-                                                          </span>
+                                                          <fmt:formatDate value="${f.nextScheduledAt}" pattern="yyyy.MM.dd"/>
+                                                          &nbsp;(D<c:if test="${f.daysDelta >= 0}">-</c:if>${f.daysDelta})
+                                                        </span>
                                                     </c:when>
 
                                                     <c:otherwise>
                                                         <span class="badge">점검 예정 없음</span>
                                                     </c:otherwise>
                                                 </c:choose>
+
                                             </div>
                                         </div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp
index b636cbf..35a0479 100644
--- a/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/facilities_add.jsp
@@ -1,3 +1,5 @@
+<!-- 작성자: 김민서 -->
+
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp
index 15c522c..fb557cd 100644
--- a/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/facilities_detail.jsp
@@ -1,7 +1,10 @@
+<!-- 작성자: 김민서 -->
+
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c"   uri="jakarta.tags.core" %>
 <%@ taglib prefix="fmt" uri="jakarta.tags.fmt" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+
 <!DOCTYPE html>
 <html lang="ko">
 <head>
diff --git a/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp b/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp
index 31f93f6..c2cee67 100644
--- a/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/facilities_edit.jsp
@@ -1,3 +1,5 @@
+<!-- 작성자: 김민서 -->
+
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
diff --git a/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp b/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp
index fd3ca4d..d1ca01d 100644
--- a/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/facility_qr.jsp
@@ -1,3 +1,5 @@
+<!-- 작성자: 김민서 -->
+
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <!DOCTYPE html>
diff --git a/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp b/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp
index 9f0dd30..aa41705 100644
--- a/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/jusoPopup.jsp
@@ -1,3 +1,6 @@
+<!-- 작성자: 김민서 -->
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html lang="ko">
@@ -23,7 +26,8 @@
                 var f = document.getElementById('jusoForm');
                 f.confmKey.value  = "devU01TX0FVVEgyMDI1MDkwOTEwMzUxNjExNjE2MTk="; // !!반드시 본인 승인키로 교체!!
 // 절대경로로 (내 서버) 세팅
-                f.returnUrl.value = "<%= request.getScheme() %>://<%= request.getServerName() %>:<%= request.getServerPort() %><%= request.getContextPath() %>/popup/juso";
+// 💡 host를 하드코딩해 버리면 끝
+                f.returnUrl.value = 'https://qure.site' + '<c:url value="/popup/juso"/>';
                 f.resultType.value = "4";
                 f.action = "https://business.juso.go.kr/addrlink/addrLinkUrl.do";
                 f.submit();
diff --git a/src/main/webapp/WEB-INF/views/facilities/map.jsp b/src/main/webapp/WEB-INF/views/facilities/map.jsp
index 3e100f3..f765913 100644
--- a/src/main/webapp/WEB-INF/views/facilities/map.jsp
+++ b/src/main/webapp/WEB-INF/views/facilities/map.jsp
@@ -1,3 +1,5 @@
+<!-- 작성자: 김민서 -->
+
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <!DOCTYPE html>
@@ -18,7 +20,7 @@
     <link rel="stylesheet" href="<c:url value='/assets/css/map.css'/>" />
 
     <!-- autoload=false 로드 -->
-    <script src="https://dapi.kakao.com/v2/maps/sdk.js?appkey=${kakaoAppKey}&autoload=false"></script>
+    <script defer src="https://dapi.kakao.com/v2/maps/sdk.js?appkey=${kakaoAppKey}&libraries=services&autoload=false"></script>
 </head>
 <body>
 <!-- nav 변수 설정 (사이드바에서 '지도' 메뉴 활성화) -->
@@ -44,7 +46,7 @@
         </div>
     </main>
 </div>
-<script>
+<script defer>
     // 전역 변수 선언
     var map;
     var facilityData = [];
@@ -201,12 +203,14 @@
         });
     }
 
-    kakao.maps.load(async function () {
+    // 실제 지도 초기화 함수
+    async function initMap() {
         map = new kakao.maps.Map(document.getElementById('map'), {
             center: new kakao.maps.LatLng(37.5665, 126.9780),
             level: 7
         });
 
+        // 리사이즈 시 relayout
         var resizeTimeout;
         window.addEventListener('resize', function(){
             clearTimeout(resizeTimeout);
@@ -214,20 +218,17 @@
         });
 
         try {
-            const res = await fetch('<c:url value="/api/facilities/markers"/>', { credentials:'same-origin', headers:{ 'Accept':'application/json' }});
+            const res = await fetch('<c:url value="/api/facilities/markers"/>', {
+                credentials:'same-origin',
+                headers:{ 'Accept':'application/json' }
+            });
             if (!res.ok) throw new Error('API 실패: ' + res.status);
 
             const data = await res.json();
-
             if (!data || data.length === 0) {
-                document.getElementById('facility-list').innerHTML = '<div class="loading">표시할 시설이 없습니다.</div>';
-                // 중앙에 말풍선 표시
-                var centerOverlay = createBalloonOverlay(
-                    map.getCenter(),
-                    '<div>표시할 시설이 없습니다.</div>',
-                    false
-                );
-                centerOverlay.setMap(map);
+                document.getElementById('facility-list').innerHTML =
+                    '<div class="loading">표시할 시설이 없습니다.</div>';
+                createBalloonOverlay(map.getCenter(), '<div>표시할 시설이 없습니다.</div>', false).setMap(map);
                 return;
             }
 
@@ -258,80 +259,65 @@
             );
             var imgMulti = imgSingle;
 
+            // 마커 + 오버레이 생성
             locationGroups.forEach(function(group){
                 var lat = group.lat, lng = group.lng, facilities = group.facilities;
-                try {
-                    var pos = new kakao.maps.LatLng(lat, lng);
-                    var marker = new kakao.maps.Marker({
-                        position: pos,
-                        image: facilities.length > 1 ? imgMulti : imgSingle,
-                        map: map,
-                        clickable: true
+                var pos = new kakao.maps.LatLng(lat, lng);
+                var marker = new kakao.maps.Marker({
+                    position: pos,
+                    image: facilities.length > 1 ? imgMulti : imgSingle,
+                    map: map,
+                    clickable: true
+                });
+                bounds.extend(pos);
+                locationCount++;
+
+                var overlay;
+                if (facilities.length === 1) {
+                    var f = facilities[0];
+                    var name = f.name || '이름없음';
+                    var addr = f.address || '';
+                    var detailLink = '<c:url value="/facilities/"/>' + f.facilityId;
+                    var html = '<div><b>' + name + '</b></div>' +
+                        '<div style="color:#666">' + addr + '</div>' +
+                        '<div style="margin-top:6px"><a href="' + detailLink + '">상세보기</a></div>';
+                    overlay = createBalloonOverlay(pos, html, false);
+                    overlays[f.originalIndex] = overlay;
+                    markers[f.originalIndex]  = marker;
+                } else {
+                    var listHtml = '<div class="balloon-title">📍 이 위치의 시설들 (' + facilities.length + '개)</div>';
+                    facilities.forEach(function(ff){
+                        var nm = ff.name || '이름없음';
+                        var ad = ff.address || '';
+                        listHtml += '<div class="balloon-item" data-idx="' + ff.originalIndex + '">' +
+                            '  <div class="name">' + nm + '</div>' +
+                            '  <div class="addr">' + ad + '</div>' +
+                            '</div>';
                     });
-                    bounds.extend(pos);
-                    locationCount++;
-
-                    // 오버레이 내용 구성
-                    var overlay;
-                    if (facilities.length === 1) {
-                        var f = facilities[0];
-                        var name = f.name ? f.name : '이름없음';
-                        var addr = f.address ? f.address : '';
-                        var detailLink = '<c:url value="/facilities/"/>' + f.facilityId;
+                    overlay = createBalloonOverlay(pos, listHtml, true);
 
-                        var html =
-                            '<div><b>' + name + '</b></div>' +
-                            '<div style="color:#666">' + addr + '</div>' +
-                            '<div style="margin-top:6px"><a href="' + detailLink + '">상세보기</a></div>';
-
-                        overlay = createBalloonOverlay(pos, html, false);
-
-                        // 인덱스 매핑
-                        overlays[f.originalIndex] = overlay;
-                        markers[f.originalIndex] = marker;
-
-                    } else {
-                        var listHtml = '<div class="balloon-title">📍 이 위치의 시설들 (' + facilities.length + '개)</div>';
-                        for (var j = 0; j < facilities.length; j++) {
-                            var ff = facilities[j];
-                            var nm = ff.name ? ff.name : '이름없음';
-                            var ad = ff.address ? ff.address : '';
-                            listHtml +=
-                                '<div class="balloon-item" data-idx="' + ff.originalIndex + '">' +
-                                '  <div class="name">' + nm + '</div>' +
-                                '  <div class="addr">' + ad + '</div>' +
-                                '</div>';
-                        }
-
-                        overlay = createBalloonOverlay(pos, listHtml, true);
-
-                        // 리스트 항목 클릭 → selectFacility 연결
-                        // (content는 DOM이므로 이벤트 위임)
-                        var contentEl = overlay.getContent();
-                        contentEl.addEventListener('click', function(e){
-                            var itemEl = e.target.closest('.balloon-item');
-                            if (!itemEl) return;
-                            var idx = Number(itemEl.getAttribute('data-idx'));
-                            overlays.forEach(function(ov){ ov && ov.setMap(null); });
-                            selectFacility(idx);
-                        });
-
-                        facilities.forEach(function(f){
-                            overlays[f.originalIndex] = overlay;
-                            markers[f.originalIndex] = marker;
-                        });
-                    }
-
-                    kakao.maps.event.addListener(marker, 'click', function () {
+                    var contentEl = overlay.getContent();
+                    contentEl.addEventListener('click', function(e){
+                        var itemEl = e.target.closest('.balloon-item');
+                        if (!itemEl) return;
+                        var idx = Number(itemEl.getAttribute('data-idx'));
                         overlays.forEach(function(ov){ ov && ov.setMap(null); });
-                        overlay.setMap(map);
+                        selectFacility(idx);
                     });
 
-                } catch (e) {
-                    console.error('마커/오버레이 생성 실패:', e, { lat: lat, lng: lng, facilities: facilities });
+                    facilities.forEach(function(f){
+                        overlays[f.originalIndex] = overlay;
+                        markers[f.originalIndex]  = marker;
+                    });
                 }
+
+                kakao.maps.event.addListener(marker, 'click', function () {
+                    overlays.forEach(function(ov){ ov && ov.setMap(null); });
+                    overlay.setMap(map);
+                });
             });
 
+            // 지도 영역 조정
             if (locationCount > 0) {
                 if (locationCount === 1) {
                     map.setLevel(3);
@@ -348,16 +334,24 @@
             console.error('지도 로딩 오류:', err);
             document.getElementById('facility-list').innerHTML =
                 '<div class="loading">오류: 시설 데이터를 불러오지 못했습니다.</div>';
+            createBalloonOverlay(map.getCenter(), '<div>오류: 시설 데이터를 불러오지 못했습니다.</div>', false).setMap(map);
+        }
+    }
 
-            // 오류도 말풍선으로 안내
-            var errorOverlay = createBalloonOverlay(
-                map.getCenter(),
-                '<div>오류: 시설 데이터를 불러오지 못했습니다.</div>',
-                false
-            );
-            errorOverlay.setMap(map);
+
+    // SDK 준비 후 initMap 실행
+    function ensureKakaoSdkAndInit() {
+        if (window.kakao && kakao.maps && typeof kakao.maps.load === 'function') {
+            kakao.maps.load(initMap);
+            return;
+        }
+        var existed = document.querySelector('script[src*="dapi.kakao.com/v2/maps/sdk.js"]');
+        if (existed) {
+            existed.addEventListener('load', function(){ kakao.maps.load(initMap); });
         }
-    });
+    }
+
+    window.addEventListener('DOMContentLoaded', ensureKakaoSdkAndInit);
 </script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf b/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf
index 377ca56..7e98539 100644
--- a/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf
+++ b/src/main/webapp/WEB-INF/views/fragments/sidebar.jspf
@@ -1,8 +1,10 @@
+<!-- 작성자: 김민서 -->
+
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 
 <aside class="app-nav" aria-label="주 메뉴">
     <!-- 로고 -->
-    <a href="<c:url value='/dashboard' context='/'/>"
+    <a href="<c:url value='/dashboard'/>"
        class="nav-btn brand ${nav=='dashboard'?'active':''}"
        aria-label="대시보드"
        <c:if test="${nav=='dashboard'}">aria-current="page"</c:if>>
@@ -13,7 +15,7 @@
     <!-- 메뉴 그룹 -->
     <div class="nav-group">
         <!-- 설비 -->
-        <a href="<c:url value='/facilities' context='/'/>"
+        <a href="<c:url value='/facilities'/>"
            class="nav-btn ${nav=='facilities'?'active':''}"
            aria-label="설비"
            <c:if test="${nav=='facilities'}">aria-current="page"</c:if>>
@@ -29,7 +31,7 @@
         </a>
 
         <!-- 점검표 -->
-        <a href="<c:url value='/template' context='/'/>"
+        <a href="<c:url value='/template'/>"
            class="nav-btn ${nav=='template'?'active':''}"
            aria-label="점검표"
            <c:if test="${nav=='template'}">aria-current="page"</c:if>>
@@ -61,7 +63,7 @@
         </a>
 
         <!-- 민원 -->
-        <a href="<c:url value='/admin/complain' context='/'/>"
+        <a href="<c:url value='/admin/complain'/>"
            class="nav-btn ${nav=='complain'?'active':''}"
            aria-label="민원"
            <c:if test="${nav=='complain'}">aria-current="page"</c:if>>
@@ -77,7 +79,7 @@
         </a>
 
         <!-- 지도 -->
-        <a href="<c:url value='/map' context='/'/>"
+        <a href="<c:url value='/map'/>"
            class="nav-btn ${nav=='map'?'active':''}"
            aria-label="지도"
            <c:if test="${nav=='map'}">aria-current="page"</c:if>>
diff --git a/src/main/webapp/WEB-INF/views/login/login.jsp b/src/main/webapp/WEB-INF/views/login/login.jsp
index 7ab5ee8..21a2f1a 100644
--- a/src/main/webapp/WEB-INF/views/login/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login/login.jsp
@@ -6,7 +6,7 @@
 <html lang="ko">
 <head>
     <meta charset="UTF-8">
-    <title>The Cure</title>
+    <title>The Qure</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="<c:url value='/assets/css/login.css'/>" />
 </head>
@@ -16,7 +16,7 @@
         <div class="text-container">
             QR 하나로 끝나는 <br>
             완벽한 시설 점검<br>
-            <span class="highlight">THE CURE</span>
+            <span class="highlight">THE QURE</span>
         </div>
        <a href="<c:url value='/oauth2/authorization/kakao'/>" class="kakao-login">
            <img src="<c:url value='/assets/images/kakao.svg'/>" alt="카카오 로그인 버튼" />
diff --git a/src/main/webapp/WEB-INF/views/template/_insertBody.jsp b/src/main/webapp/WEB-INF/views/template/_insertBody.jsp
index b8fe42d..b2b74a5 100644
--- a/src/main/webapp/WEB-INF/views/template/_insertBody.jsp
+++ b/src/main/webapp/WEB-INF/views/template/_insertBody.jsp
@@ -1,4 +1,5 @@
-<!-- /WEB-INF/views/template/_insertBody.jsp -->
+<!-- 작성자: 김민서 -->
+
 <%@ page language="java" contentType="text/html; charset=UTF-8"
          pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
diff --git a/src/main/webapp/WEB-INF/views/template/insertForm.jsp b/src/main/webapp/WEB-INF/views/template/insertForm.jsp
index dc0a750..4010bc2 100644
--- a/src/main/webapp/WEB-INF/views/template/insertForm.jsp
+++ b/src/main/webapp/WEB-INF/views/template/insertForm.jsp
@@ -1,3 +1,5 @@
+<!-- 팝업 관련 작성자: 김민서 -->
+
 <%@ page language="java" contentType="text/html; charset=UTF-8"
          pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
diff --git a/src/main/webapp/WEB-INF/views/template/select_popup.jsp b/src/main/webapp/WEB-INF/views/template/select_popup.jsp
index eaf0536..d4b2a5a 100644
--- a/src/main/webapp/WEB-INF/views/template/select_popup.jsp
+++ b/src/main/webapp/WEB-INF/views/template/select_popup.jsp
@@ -1,3 +1,5 @@
+<!-- 작성자: 김민서 -->
+
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ taglib prefix="fn" uri="jakarta.tags.functions" %>