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/web/form/IssueForm.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueForm.java
index 9ff571f..87aade8 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueForm.java
@@ -41,7 +41,9 @@
     private List<Map<String, Object>> issueCompanyFields = Lists.newArrayList();
     private List<Map<String, Object>> issueIspFields = Lists.newArrayList();
     private List<Map<String, Object>> issueHostingFields = Lists.newArrayList();
+    private List<Map<String, Object>> files = Lists.newArrayList(); // api�슜 泥⑤��뙆�씪
     private Long parentIssueId; // �긽�쐞 �씠�뒋
+    private String isApi;
 
     public IssueForm() {
     }
@@ -116,6 +118,11 @@
         //  HOSTING �븘�뱶 �젙蹂�
         if (MapUtil.getObject(params, "issueHostingFields") != null){
             form.setIssueHostingFields((List)MapUtil.getObject(params, "issueHostingFields"));
+        }
+
+        //  api 泥⑤��뙆�씪
+        if (MapUtil.getObject(params, "files") != null){
+            form.setFiles((List)MapUtil.getObject(params, "files"));
         }
         return form;
     }
@@ -340,6 +347,22 @@
         this.parentIssueId = parentIssueId;
     }
 
+    public String getIsApi() {
+        return isApi;
+    }
+
+    public void setIsApi(String isApi) {
+        this.isApi = isApi;
+    }
+
+    public List<Map<String, Object>> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<Map<String, Object>> files) {
+        this.files = files;
+    }
+
     public String getTemplate() {
         return template;
     }

--
Gitblit v1.8.0