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/IssueHistoryService.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java index f9417a5..0951dd2 100644 --- a/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java +++ b/src/main/java/kr/wisestone/owl/service/IssueHistoryService.java @@ -18,8 +18,12 @@ void addIssueHistory(Issue issue, IssueHistoryType issueHistoryType, String issueChangeDescription); + void addIssueHistory(Issue issue, User user, IssueHistoryType issueHistoryType, String issueChangeDescription); + void makeDescription(StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription); + void makeDescription(User user, StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription); + void findIssueHistory(Map<String, Object> resJsonData, IssueHistoryCondition issueHistoryCondition); List<IssueHistoryVo> findIssueHistory(Long issueId); -- Gitblit v1.8.0