Merge branch 'eskim' into develop

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

@@ -61,6 +61,7 @@
 		      , ERP_STOCK_LINK_YN
 		      , NEW_CUST_ORD_YN
 		      , ADULT_YN
+		      , TOBE_FORM_YN
 		      , REG_NO
 		      , REG_DT
 		      , UPD_NO
@@ -121,6 +122,7 @@
 		     , ERP_STOCK_LINK_YN   
 		     , NEW_CUST_ORD_YN
 		     , ADULT_YN
+		     , TOBE_FORM_YN
 		     , #{regNo}              
 		     , NOW()              
 		     , UPD_NO              

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

@@ -82,11 +82,11 @@
 			  , ERP_STOCK_LINK_YN
 			  , NEW_CUST_ORD_YN
 			  , ADULT_YN
+			  , TOBE_FORM_YN
 			  , REG_NO
 			  , REG_DT
 			  , UPD_NO
 			  , UPD_DT
-				
 			)
 			SELECT GOODS_CD
 				  , BRAND_CD
@@ -146,6 +146,7 @@
 				  , ERP_STOCK_LINK_YN
 				  , NEW_CUST_ORD_YN
 				  , ADULT_YN
+				  , TOBE_FORM_YN
 				  , #{regNo}
 			      , now()
 				  , #{updNo}
@@ -255,6 +256,7 @@
 		  , ERP_STOCK_LINK_YN
 		  , NEW_CUST_ORD_YN
 		  , ADULT_YN
+		  , TOBE_FORM_YN
 		  , REG_NO
 		  , REG_DT
 		  , UPD_NO
@@ -319,6 +321,7 @@
 			  , ERP_STOCK_LINK_YN
 			  , NEW_CUST_ORD_YN
 			  , ADULT_YN
+			  , TOBE_FORM_YN
 			  , #{regNo}
 		      , now()
 			  , #{updNo}