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/AttachedFileService.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/AttachedFileService.java b/src/main/java/kr/wisestone/owl/service/AttachedFileService.java index f75d388..6a88a81 100644 --- a/src/main/java/kr/wisestone/owl/service/AttachedFileService.java +++ b/src/main/java/kr/wisestone/owl/service/AttachedFileService.java @@ -19,6 +19,8 @@ List<AttachedFile> addAttachedFile(List<MultipartFile> multipartFiles, Map<String, Object> content); + List<AttachedFile> addAttachedFile(Workspace workspace, Issue issue, List<Map<String, Object>> files); + List<AttachedFileVo> findAttachedFile(Map<String, Object> resJsonData, AttachedFileCondition condition); List<AttachedFile> findByIssueId(Long issueId); -- Gitblit v1.8.0