Merge branch 'jsshin' into develop

src/main/java/com/style24/persistence/mybatis/shop/TsbCustomer.xml

@@ -74,6 +74,8 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , EMAIL_AGREE_DT
+		     , MK_AGREE_YN
+		     , MK_AGREE_DT
 		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
@@ -117,6 +119,8 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , EMAIL_AGREE_DT
+		     , MK_AGREE_YN
+		     , MK_AGREE_DT
 		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
@@ -167,6 +171,8 @@
 		     , EMAIL_AGREE_DT = NULL
 		     , APP_AGREE_YN = 'N'
 		     , APP_AGREE_DT = NULL
+		     , MK_AGREE_YN = 'N'
+		     , MK_AGREE_DT = NULL
 		     , HOME_ZIPCODE = NULL
 		     , HOME_BASE_ADDR = NULL
 		     , HOME_DTL_ADDR = NULL