Merge branch 'master' of

http://112.172.147.34:4936/style24/style24.doc.git

Conflicts:
	산출물/3.설계/ST24_TSIT-D202-프로그램목록(V2.5)-20210319.xlsx

산출물/3.설계/05.DB-Object/06.DDL/table.sql

@@ -3684,6 +3684,8 @@ CREATE TABLE TB_DORMANT_CUST (
   EMAIL           VARCHAR(200) NULL     COMMENT '이메일(탈퇴 시 NULL로 처리)', -- 이메일_암호화
   EMAIL_AGREE_YN  CHAR(1)      NOT NULL DEFAULT 'N' COMMENT '이메일수신동의여부', -- 이메일수신동의여부
   EMAIL_AGREE_DT  TIMESTAMP    NULL     COMMENT '이메일수신동의일시', -- 이메일수신동의일시
+  MK_AGREE_YN     CHAR(1)            NOT NULL DEFAULT 'N' COMMENT '마케팅수신동의여부',
+  MK_AGREE_DT     TIMESTAMP          NULL COMMENT '마케팅수신동의일시',
   HOME_ZIPCODE    VARCHAR(200) NULL     COMMENT '자택우편번호(탈퇴 시 NULL로 처리)', -- 자택우편번호_암호화
   HOME_BASE_ADDR  VARCHAR(200) NULL     COMMENT '자택기본주소(탈퇴 시 NULL로 처리)', -- 자택기본주소_암호화
   HOME_DTL_ADDR   VARCHAR(200) NULL     COMMENT '자택상세주소(탈퇴 시 NULL로 처리)', -- 자택상세주소_암호화
@@ -5554,6 +5556,8 @@ CREATE TABLE TB_SECEDE_CUST (
   EMAIL           VARCHAR(200) NULL     COMMENT '이메일(탈퇴 시 NULL로 처리)', -- 이메일_암호화
   EMAIL_AGREE_YN  CHAR(1)      NOT NULL DEFAULT 'N' COMMENT '이메일수신동의여부', -- 이메일수신동의여부
   EMAIL_AGREE_DT  TIMESTAMP    NULL     COMMENT '이메일수신동의일시', -- 이메일수신동의일시
+  MK_AGREE_YN     CHAR(1)            NOT NULL DEFAULT 'N' COMMENT '마케팅수신동의여부',
+  MK_AGREE_DT     TIMESTAMP          NULL COMMENT '마케팅수신동의일시',
   HOME_ZIPCODE    VARCHAR(200) NULL     COMMENT '자택우편번호(탈퇴 시 NULL로 처리)', -- 자택우편번호_암호화
   HOME_BASE_ADDR  VARCHAR(200) NULL     COMMENT '자택기본주소(탈퇴 시 NULL로 처리)', -- 자택기본주소_암호화
   HOME_DTL_ADDR   VARCHAR(200) NULL     COMMENT '자택상세주소(탈퇴 시 NULL로 처리)', -- 자택상세주소_암호화
@@ -11944,6 +11948,8 @@ CREATE TABLE TB_CUSTOMER (
   EMAIL           VARCHAR(200)       NULL     COMMENT '이메일(탈퇴 시 NULL로 처리)', -- 이메일_암호화
   EMAIL_AGREE_YN  CHAR(1)            NOT NULL DEFAULT 'N' COMMENT '이메일수신동의여부', -- 이메일수신동의여부
   EMAIL_AGREE_DT  TIMESTAMP          NULL     COMMENT '이메일수신동의일시', -- 이메일수신동의일시
+  MK_AGREE_YN     CHAR(1)            NOT NULL DEFAULT 'N' COMMENT '마케팅수신동의여부',
+  MK_AGREE_DT     TIMESTAMP          NULL COMMENT '마케팅수신동의일시',
   HOME_ZIPCODE    VARCHAR(200)       NULL     COMMENT '자택우편번호(탈퇴 시 NULL로 처리)', -- 자택우편번호_암호화
   HOME_BASE_ADDR  VARCHAR(200)       NULL     COMMENT '자택기본주소(탈퇴 시 NULL로 처리)', -- 자택기본주소_암호화
   HOME_DTL_ADDR   VARCHAR(200)       NULL     COMMENT '자택상세주소(탈퇴 시 NULL로 처리)', -- 자택상세주소_암호화
@@ -12037,6 +12043,8 @@ CREATE TABLE TB_CUSTOMER_HST
   EMAIL           VARCHAR(200) NULL COMMENT '이메일(탈퇴 시 NULL로 처리)',
   EMAIL_AGREE_YN  CHAR DEFAULT 'N' NOT NULL COMMENT '이메일수신동의여부',
   EMAIL_AGREE_DT  TIMESTAMP NULL COMMENT '이메일수신동의일시',
+  MK_AGREE_YN     CHAR(1)            NOT NULL DEFAULT 'N' COMMENT '마케팅수신동의여부',
+  MK_AGREE_DT     TIMESTAMP          NULL COMMENT '마케팅수신동의일시',
   HOME_ZIPCODE    VARCHAR(200) NULL COMMENT '자택우편번호(탈퇴 시 NULL로 처리)',
   HOME_BASE_ADDR  VARCHAR(200) NULL COMMENT '자택기본주소(탈퇴 시 NULL로 처리)',
   HOME_DTL_ADDR   VARCHAR(200) NULL COMMENT '자택상세주소(탈퇴 시 NULL로 처리)',
@@ -12860,6 +12868,7 @@ CREATE TABLE TB_CUST_MARKET_HST (
   APP_AGREE_YN       CHAR(1)      NOT NULL COMMENT '앱푸쉬수신동의여부', -- 앱푸쉬수신동의여부
   SMS_AGREE_YN       CHAR(1)      NOT NULL COMMENT 'SMS수신동의여부', -- SMS수신동의여부
   EMAIL_AGREE_YN     CHAR(1)      NOT NULL COMMENT '이메일수신동의여부', -- 이메일수신동의여부
+  MK_AGREE_YN        CHAR(1)      NOT NULL DEFAULT 'N' COMMENT '마케팅수신동의여부'
   REG_NO             INT UNSIGNED NOT NULL COMMENT '등록자번호', -- 등록자번호
   REG_DT             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '등록일시' -- 등록일시
 )

산출물/3.설계/ERD/.metadata/.log

@@ -4448,3 +4448,73 @@ Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps
 
 !ENTRY org.eclipse.osgi 2 1 2021-03-15 10:17:23.269
 !MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages
+!SESSION 2021-03-22 10:31:53.520 -----------------------------------------------
+eclipse.buildId=M20090211-1700
+java.version=1.6.0_24
+java.vendor=Sun Microsystems Inc.
+BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=ko_KR
+Framework arguments:  D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd
+Command-line arguments:  -os win32 -ws win32 -arch x86 D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:54.535
+!MESSAGE NLS unused message: OpenResourceDialog_openButton_text in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:54.535
+!MESSAGE NLS unused message: OpenResourceDialog_openWithMenu_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:54.535
+!MESSAGE NLS unused message: OpenResourceDialog_openWithButton_toolTip in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:54.535
+!MESSAGE NLS unused message: CleanDialog_cleanSelectedTaskName in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:54.535
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_PromptAtStartup_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:54.535
+!MESSAGE NLS unused message: RecentWorkspacesPreferencePage_RemoveButton_label in: org.eclipse.ui.internal.ide.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.568
+!MESSAGE NLS unused message: url_couldNotResolve_projectDoesNotExist in: org.eclipse.core.internal.utils.messages
+
+!ENTRY org.eclipse.core.resources 2 10035 2021-03-22 10:31:58.646
+!MESSAGE The workspace exited with unsaved changes in the previous session; refreshing workspace to recover changes.
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: Shortcuts_shortcutTab in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: Shortcuts_selectShortcutsLabel in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: Shortcuts_availableMenus in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: Shortcuts_availableCategories in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: Shortcuts_allShortcuts in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: Util_listNull in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: OpenBrowserHandler_NoInfoDialogTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:31:58.944
+!MESSAGE NLS unused message: AboutFeaturesDialog_SimpleTitle in: org.eclipse.ui.internal.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:32:03.772
+!MESSAGE NLS unused message: BinaryDumpHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:32:03.772
+!MESSAGE NLS unused message: ConvertToXMLHandler_1 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:32:03.772
+!MESSAGE NLS unused message: SelectHandler_11 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:32:03.772
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_4 in: com.tomato.exerd.handler.messages
+
+!ENTRY org.eclipse.osgi 2 1 2021-03-22 10:32:03.772
+!MESSAGE NLS unused message: ToggleColumnVisibilityHandler_5 in: com.tomato.exerd.handler.messages

산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

@@ -7,8 +7,8 @@
 	<section name="SaveAsDialogSettings">
 		<item value="525" key="DIALOG_WIDTH"/>
 		<item value="-51" key="DIALOG_Y_ORIGIN"/>
-		<item value="88" key="DIALOG_X_ORIGIN"/>
 		<item value="580" key="DIALOG_HEIGHT"/>
+		<item value="88" key="DIALOG_X_ORIGIN"/>
 		<item value="1|맑은 고딕|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|맑은 고딕" key="DIALOG_FONT_NAME"/>
 	</section>
 </section>

산출물/3.설계/ERD/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<workbench progressCount="16" version="2.0">
+<workbench progressCount="15" version="2.0">
 <workbenchAdvisor/>
 <window height="768" maximized="true" width="1025" x="1697" y="606">
 <fastViewData fastViewLocation="1024"/>
@@ -32,10 +32,10 @@
 </folder>
 </info>
 </editorArea>
-<editor id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" partName="ST24.exerd" title="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd" workbook="DefaultEditorWorkbook">
+<editor activePart="true" focus="true" id="com.tomato.exerd.editor.DiagramEditor" name="ST24.exerd" partName="ST24.exerd" title="ST24.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\ST24.exerd" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 </editor>
-<editor activePart="true" focus="true" id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" partName="iSTYLE24_Mall.exerd" title="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd" workbook="DefaultEditorWorkbook">
+<editor id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Mall.exerd" partName="iSTYLE24_Mall.exerd" title="iSTYLE24_Mall.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Mall.exerd" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 </editor>
 <editor id="com.tomato.exerd.editor.DiagramEditor" name="iSTYLE24_Wms.exerd" partName="iSTYLE24_Wms.exerd" title="iSTYLE24_Wms.exerd" tooltip="D:\WIDE\workspace\webapps\style24\style24.doc\산출물\3.설계\ERD\asis\iSTYLE24_Wms.exerd" workbook="DefaultEditorWorkbook">
@@ -174,14 +174,8 @@
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 <editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/asis/iSTYLE24_Mall.exerd"/>
+<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="com.tomato.exerd.editor.DiagramEditor" uri="file:/D:/WIDE/workspace/webapps/style24/style24.doc/산출물/3.설계/ERD/ST24.exerd"/>
 </editors>
-<item historyLabel="ST24.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="0"/>
-<item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
-<item historyLabel="ST24.exerd" index="0"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
 <item historyLabel="ST24.exerd" index="0"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="1"/>
@@ -224,7 +218,14 @@
 <item historyLabel="ST24.exerd" index="5"/>
 <item historyLabel="iSTYLE24_Mall.exerd" index="4"/>
 <item historyLabel="ST24.exerd" index="5"/>
-<item active="true" historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item historyLabel="ST24.exerd" index="7"/>
+<item historyLabel="iSTYLE24_Mall.exerd" index="6"/>
+<item active="true" historyLabel="ST24.exerd" index="7"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
 </page>