Merge branch 'master' of http://112.172.147.34:4936/style24/style24.doc.git

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

@@ -2452,25 +2452,29 @@ INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM006', 'STYLE24MALL > 브랜드메
 INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM007', 'STYLE24MALL > 브랜드메인 > 신상품',		NULL, 'Y', 23, 12, NOW(), 12, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM008', 'STYLE24MALL > 브랜드메인 > 베스트',		NULL, 'Y', 24, 12, NOW(), 12, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM009', 'STYLE24MALL > 브랜드메인 > MD추천',		NULL, 'Y', 25, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM010', 'STYLE24MALL > 브랜드메인 > TV타이틀',		NULL, 'Y', 26, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM011', 'STYLE24MALL > 브랜드메인 > 상품롤링',		NULL, 'Y', 27, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM001', 'STYLE24MALL > 브랜드메인 > 브랜드영역',		NULL, 'Y', 28, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM002', 'STYLE24MALL > 브랜드메인 > GNB',		NULL, 'Y', 29, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM003', 'STYLE24MALL > 브랜드메인 > GNB 추천상품',	NULL, 'Y', 30, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM004', 'STYLE24MALL > 브랜드메인 > 메인롤링배너',	NULL, 'Y', 31, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM005', 'STYLE24MALL > 브랜드메인 > 브랜드소개',		NULL, 'Y', 32, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM006', 'STYLE24MALL > 브랜드메인 > 이벤트및기타배너',	NULL, 'Y', 33, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM007', 'STYLE24MALL > 브랜드메인 > 신상품',		NULL, 'Y', 34, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM008', 'STYLE24MALL > 브랜드메인 > 베스트',		NULL, 'Y', 35, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM009', 'STYLE24MALL > 브랜드메인 > MD추천',		NULL, 'Y', 36, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM010', 'STYLE24MALL > 브랜드메인 > TV타이틀',		NULL, 'Y', 37, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM011', 'STYLE24MALL > 브랜드메인 > 상품롤링',		NULL, 'Y', 38, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SOM001', 'STYLE24MALL > 아울렛메인 > 메인롤링배너',		NULL, 'Y', 39, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SOM002', 'STYLE24MALL > 아울렛메인 > MD추천',		NULL, 'Y', 40, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SOM003', 'STYLE24MALL > 아울렛메인 > 베스트',		NULL, 'Y', 41, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SCM001', 'STYLE24MALL > 카테고리메인 > 메인배너',		NULL, 'Y', 42, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SCM002', 'STYLE24MALL > 카테고리메인 > 신상품',		NULL, 'Y', 43, 12, NOW(), 12, NOW());
-INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SCM003', 'STYLE24MALL > 카테고리메인 > 베스트',		NULL, 'Y', 44, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM010', 'STYLE24MALL > 브랜드메인 > 룩북',			NULL, 'Y', 26, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM011', 'STYLE24MALL > 브랜드메인 > 기획전콘텐츠',		NULL, 'Y', 27, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM012', 'STYLE24MALL > 브랜드메인 > TV타이틀',		NULL, 'Y', 28, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBM013', 'STYLE24MALL > 브랜드메인 > 상품롤링',		NULL, 'Y', 29, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM001', 'STYLE24MALL > 브랜드메인 > 브랜드영역',		NULL, 'Y', 30, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM002', 'STYLE24MALL > 브랜드메인 > GNB',		NULL, 'Y', 31, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM003', 'STYLE24MALL > 브랜드메인 > GNB 추천상품',	NULL, 'Y', 32, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM004', 'STYLE24MALL > 브랜드메인 > 메인롤링배너',	NULL, 'Y', 33, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM005', 'STYLE24MALL > 브랜드메인 > 브랜드소개',		NULL, 'Y', 34, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM006', 'STYLE24MALL > 브랜드메인 > 이벤트및기타배너',	NULL, 'Y', 35, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM007', 'STYLE24MALL > 브랜드메인 > 신상품',		NULL, 'Y', 36, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM008', 'STYLE24MALL > 브랜드메인 > 베스트',		NULL, 'Y', 37, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM009', 'STYLE24MALL > 브랜드메인 > MD추천',		NULL, 'Y', 38, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM010', 'STYLE24MALL > 브랜드메인 > 룩북',			NULL, 'Y', 39, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM011', 'STYLE24MALL > 브랜드메인 > 기획전콘텐츠',	NULL, 'Y', 40, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM012', 'STYLE24MALL > 브랜드메인 > TV타이틀',		NULL, 'Y', 41, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SBMM013', 'STYLE24MALL > 브랜드메인 > 상품롤링',		NULL, 'Y', 42, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SOM001', 'STYLE24MALL > 아울렛메인 > 메인롤링배너',		NULL, 'Y', 43, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SOM002', 'STYLE24MALL > 아울렛메인 > MD추천',		NULL, 'Y', 44, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SOM003', 'STYLE24MALL > 아울렛메인 > 베스트',		NULL, 'Y', 45, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SCM001', 'STYLE24MALL > 카테고리메인 > 메인배너',		NULL, 'Y', 46, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SCM002', 'STYLE24MALL > 카테고리메인 > 신상품',		NULL, 'Y', 47, 12, NOW(), 12, NOW());
+INSERT INTO TB_COMMON_CODE VALUES ('G028',	'SCM003', 'STYLE24MALL > 카테고리메인 > 베스트',		NULL, 'Y', 48, 12, NOW(), 12, NOW());
 
 INSERT INTO TB_COMMON_CODE VALUES ('ROOT', 'G029', 'Family Site', NULL, 'Y', 29, 1, NOW(), 1, NOW());
 INSERT INTO TB_COMMON_CODE VALUES ('G029', 'G029_10', 'http://www.hansaeyes24.com|한세예스24홀딩스', NULL, 'Y', 10, 1, NOW(), 1, NOW());
@@ -11657,6 +11661,9 @@ ALTER TABLE TB_CATE_GOODS
       CATE_NO,  -- 카테고리번호
       GOODS_CD  -- 상품코드
     );
+<<<<<<< HEAD
+	
+=======
 
 CREATE INDEX IX_CATE_GOODS_01
   ON TB_CATE_GOODS (
@@ -11666,6 +11673,7 @@ CREATE INDEX IX_CATE_GOODS_01
 -- ALTER TABLE TB_CATE_GOODS ADD COLUMN CONTENTS_LOC VARCHAR(20) DEFAULT NULL COMMENT '컨텐츠위치(공통코드G028)' AFTER GOODS_CD;
 -- ALTER TABLE TB_CATE_GOODS ADD COLUMN CONTENTS_SQ INT UNSIGNED DEFAULT NULL COMMENT '컨텐츠일련번호' AFTER CONTENTS_LOC;	
 
+>>>>>>> 68d16bfc7a5fcd075bc13f2bbeb3597fd8477ae7
 ################################################################################
 #색상
 ################################################################################
@@ -12119,6 +12127,9 @@ CREATE INDEX IX_CUST_ACCOUNT_01
     CUST_NO ASC -- 고객번호
   );
 
+ALTER TABLE TB_CUST_ACCOUNT
+  MODIFY COLUMN CUST_ACCOUNT_SQ INT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '고객계좌일련번호';
+
 ################################################################################
 #고객접촉이력
 ################################################################################
@@ -13402,6 +13413,7 @@ DROP TABLE IF EXISTS TMP_CONTENTS_GOODS RESTRICT;
 CREATE TABLE TMP_CONTENTS_GOODS (
 	BRAND_GROUP_NO 		INT UNSIGNED NOT NULL COMMENT '브랜드그룹번호(브랜드그룹). BYITEM인 경우 0, BYBRAND인 경우 브랜드그룹번호',
 	CATE_NO				INT UNSIGNED NOT NULL COMMENT '카테고리코드',
+	LEAF_CATE_NO		INT UNSIGNED NOT NULL COMMENT '단말카테고리번호',
 	CONTENTS_LOC		VARCHAR(20)  NOT NULL COMMENT '컨텐츠위치(공통코드G028)', 
 	PRE_CONTENTS_SQ 	INT UNSIGNED DEFAULT NULL COMMENT '컨텐츠미리보기일련번호',
   	CONTENTS_SQ 		INT UNSIGNED DEFAULT NULL COMMENT '컨텐츠일련번호',