Merge remote-tracking branch 'origin/master'

박지현

2022-02-22 1dad4d94cc415d2f8092aff0368744289337f504

 src/main/java/kr/wisestone/owl/service/IssueService.java

@@ -34,11 +34,11 @@

    Issue addRelIssue(IssueForm issueForm, List<MultipartFile> files);

    Issue addDownIssue(IssueForm issueForm, List<MultipartFile> files);
    Issue addDownIssue(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> files);

    Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);

    Issue addDownIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);
    Issue addDownIssue(Map<String, Object> resJsonData, User user, IssueForm issueForm, List<MultipartFile> multipartFiles);

    List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException;

@@ -96,7 +96,7 @@

    void sendIssueEmail(IssueForm issueForm);

    void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
    void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files);

    void reservationIssue();

@@ -114,5 +114,5 @@

    void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap);

    void sendCommonEmail(EmailCommonForm make);
    void sendCommonEmail(EmailCommonForm make, List<MultipartFile> files);
}