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/resources/migration/V1_11__Alter_Table.sql |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index 0bfb235..9fa9b72 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -184,7 +184,7 @@
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- �씠�뒋 �뀒�씠釉� ���엯 �꽕�젙(1: 硫붿씤, 2: �뿰愿�, 3: �븯�쐞)
-ALTER TABLE `issue_table_config` ADD COLUMN  `issue_id` BIGINT(20) NOT NULL;
+ALTER TABLE `issue_table_config` ADD COLUMN  `issue_type_id` BIGINT(20) NOT NULL;
 ALTER TABLE `issue_table_config` ADD COLUMN  `issue_table_type` INT(11) NOT NULL;
 ALTER TABLE `issue_table_config` ADD INDEX `issueTableTypeIndex`(`issue_table_type`);
 
@@ -208,4 +208,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- issue_type �뀒�씠釉� �뾽泥�,ISP,�샇�뒪�똿 而щ읆 異붽�
-ALTER TABLE `issue_type` ADD COLUMN  `use_company` BIGINT(11) NOT NULL DEFAULT '0';
+ALTER TABLE `issue_type` ADD COLUMN  `use_partner` BIGINT(11) NOT NULL DEFAULT '0';
+
+-- api �씠�뒋 �뿬遺�
+ALTER TABLE `issue` ADD COLUMN  `is_api` VARCHAR(1) NOT NULL DEFAULT 'N';

--
Gitblit v1.8.0