From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/IssueService.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java
index a8e1809..5e900fa 100644
--- a/src/main/java/kr/wisestone/owl/service/IssueService.java
+++ b/src/main/java/kr/wisestone/owl/service/IssueService.java
@@ -5,6 +5,7 @@
import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.domain.Workflow;
import kr.wisestone.owl.vo.IssueVo;
+import kr.wisestone.owl.web.condition.ApiMonitorCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.condition.ProjectCondition;
import kr.wisestone.owl.web.form.IssueApiForm;
@@ -72,6 +73,8 @@
void sendIssueEmail(IssueForm issueForm);
+ void sendIssueEmailPartners(IssueForm issueForm);
+
void reservationIssue();
Map<String, Object> findTask(IssueCondition taskCondition);
@@ -80,11 +83,5 @@
void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);
- //void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable);
-
- /*void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params);
-
- void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params);
-
- void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params);*/
+ void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
}
--
Gitblit v1.8.0