Merge branch 'eskim' into develop

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

@@ -183,8 +183,8 @@
 		         , IFNULL(B.CURR_APRICE, C.CURR_PRICE) AS CURR_PRICE
 		         , IFNULL(B.DC_ARATE, C.DC_RATE) AS DC_RATE
 		         , (CASE WHEN #{frontGb} = 'P' THEN IFNULL(B.PNT_APRATE, C.PNT_PRATE) ELSE IFNULL(B.PNT_AMRATE,C.PNT_MRATE) END ) AS PNT_RATE
-		         , DATE_FORMAT(A.SOCIAL_STDT, '%Y-%m-%d %H:%i:%S')  AS SOCIAL_STDT
-		         , DATE_FORMAT(A.SOCIAL_EDDT, '%Y-%m-%d %H:%i:%S')  AS SOCIAL_EDDT
+		         , DATE_FORMAT(A.SOCIAL_STDT, '%Y%m%d%H%i%S')  AS SOCIAL_STDT
+		         , DATE_FORMAT(A.SOCIAL_EDDT, '%Y%m%d%H%i%S')  AS SOCIAL_EDDT
 		    FROM TB_SOCIAL A
 		    INNER JOIN TB_SOCIAL_GOODS B ON A.SOCIAL_SQ = B.SOCIAL_SQ
 		                                 AND B.GOODS_CD = #{goodsCd}