Merge branch 'develop' into style

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

@@ -848,7 +848,7 @@
 		                             AND B.USE_YN = 'Y'
 		                             AND G.DELV_LOC_CD = B.DELV_LOC_CD 
 		INNER JOIN TB_SHIP_COMPANY SC ON B.SHIP_COMP_CD = SC.SHIP_COMP_CD
-		                              AND SC.USE_YN = 'Y'
+		                             -- AND SC.USE_YN = 'Y' /*cj대한통운 이슈로 체크제외*/
 		WHERE G.GOODS_CD = #{goodsCd}
 		ORDER BY A.DELV_FEE_CD 
 		LIMIT 1