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

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

@@ -3561,6 +3561,7 @@ CREATE TABLE TB_DELIVERY_ADDR (
   RECIP_BASE_ADDR VARCHAR(200)  NULL     COMMENT '수령자기본주소', -- 수령자기본주소
   RECIP_DTL_ADDR  VARCHAR(200)  NULL     COMMENT '수령자상세주소', -- 수령자상세주소
   DELV_MEMO       VARCHAR(1000) NULL     COMMENT '배송메모', -- 배송메모
+  OLD_ORD_NO      INT UNSIGNED  NULL,
   REG_NO          INT UNSIGNED  NOT NULL COMMENT '등록자번호', -- 등록자번호
   REG_DT          TIMESTAMP     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '등록일시', -- 등록일시
   UPD_NO          INT UNSIGNED  NOT NULL COMMENT '수정자번호', -- 수정자번호
@@ -4583,6 +4584,7 @@ DROP TABLE IF EXISTS TB_MAIN_LAYOUT RESTRICT;
 CREATE TABLE TB_MAIN_LAYOUT (
   CATE_NO        INT UNSIGNED       NOT NULL COMMENT '카테고리번호', -- 카테고리번호
   CONTENTS_LOC   VARCHAR(20)        NOT NULL COMMENT '컨텐츠위치(공통코드G028)', -- 컨텐츠위치(공통코드G028)
+  BRAND_GROUP_NO INT UNSIGNED 		NOT NULL COMMENT '브랜드그룹번호',
   DISP_ORD       SMALLINT UNSIGNED  NOT NULL DEFAULT 1 COMMENT '표시순서', -- 표시순서
   CONTENTS_YN    CHAR(1)            NOT NULL DEFAULT 'Y' COMMENT '컨텐츠여부(컨텐츠와의 연계여부. Y인 경우만 TB_CONTENTS_PREVIEW, TB_CONTENTS 테이블에 등록됨)', -- 컨텐츠여부
   COL_CNT        SMALLINT UNSIGNED  NOT NULL DEFAULT 1 COMMENT '컬럼수(한 행을 구성하는 컬럼의 수)', -- 컬럼수
@@ -4602,7 +4604,8 @@ ALTER TABLE TB_MAIN_LAYOUT
   ADD CONSTRAINT PK_MAIN_LAYOUT -- 메인레이아웃 기본키
     PRIMARY KEY (
       CATE_NO,      -- 카테고리번호
-      CONTENTS_LOC  -- 컨텐츠위치(공통코드G028)
+      CONTENTS_LOC,  -- 컨텐츠위치(공통코드G028)
+	  BRAND_GROUP_NO
     );
 
 ################################################################################
@@ -11661,19 +11664,12 @@ ALTER TABLE TB_CATE_GOODS
       CATE_NO,  -- 카테고리번호
       GOODS_CD  -- 상품코드
     );
-<<<<<<< HEAD
-	
-=======
 
 CREATE INDEX IX_CATE_GOODS_01
   ON TB_CATE_GOODS (
     GOODS_CD
   );
 
--- 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
 ################################################################################
 #색상
 ################################################################################
@@ -13433,10 +13429,11 @@ DROP TABLE IF EXISTS TMP_MAIN_LAYOUT_TITLE RESTRICT;
 CREATE TABLE TMP_MAIN_LAYOUT_TITLE (
 	CATE_NO				INT UNSIGNED NOT NULL COMMENT '카테고리코드',
 	CONTENTS_LOC		VARCHAR(20)  NOT NULL COMMENT '컨텐츠위치(공통코드G028)', 
+	BRAND_GROUP_NO 		INT UNSIGNED NOT NULL COMMENT '브랜드그룹번호',
 	CONTENTS_TITLE		VARCHAR(200) NOT NULL COMMENT '컨텐츠타이틀',
 	REG_NO				INT UNSIGNED NOT NULL COMMENT '등록자번호',
 	REG_DT				TIMESTAMP DEFAULT CURRENT_TIMESTAMP() NOT NULL COMMENT '등록일시',
-	PRIMARY KEY (CATE_NO, CONTENTS_LOC)
+	PRIMARY KEY (CATE_NO, CONTENTS_LOC, BRAND_GROUP_NO)
 )
 COMMENT '컨텐츠타이틀 임시저장. 프론트 메인 화면의 레이아웃 구성 등록에 의한 발생';
 ################################################################################