From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정

---
 src/main/java/kr/wisestone/owl/service/CustomFieldApiOverlapService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/CustomFieldApiOverlapService.java b/src/main/java/kr/wisestone/owl/service/CustomFieldApiOverlapService.java
index 0a04dec..a6897a6 100644
--- a/src/main/java/kr/wisestone/owl/service/CustomFieldApiOverlapService.java
+++ b/src/main/java/kr/wisestone/owl/service/CustomFieldApiOverlapService.java
@@ -6,9 +6,11 @@
 import kr.wisestone.owl.web.form.IssueApiDefaultForm;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Map;
 
 public interface CustomFieldApiOverlapService extends AbstractService<CustomFieldApiOverlap, Long, JpaRepository<CustomFieldApiOverlap, Long>> {
     void find(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form);
+    List<CustomFieldApiOverlap> find(Long userId, Long issueTypeId);
     boolean modify(Map<String, Object> resJsonData, CustomFieldApiOverlapForm form);
 }

--
Gitblit v1.8.0