Merge branch 'jmh' into develop

src/main/java/com/style24/batch/biz/job/shoplinker/TsbShoplinkerOrderJob.java

@@ -66,10 +66,8 @@ public class TsbShoplinkerOrderJob extends TsbAbstractJob<String, String, String
 		 *********************************************************************/
 
 		// 공휴일 체크된 시작, 종료 날짜 가져옴
-		// ShoplinkerSearch ordDateInfo = tbsShoplinkerService.getOrdDateInfo(); // 실제 날짜
-		//*****  테스트기간 30일전데이터 수집   ************************//
-		ShoplinkerSearch ordDateInfo = tbsShoplinkerService.getOrdDateInfoTest30();
-
+		ShoplinkerSearch ordDateInfo = tbsShoplinkerService.getOrdDateInfo(); // 실제 날짜
+		
 		if( null != ordDateInfo ) {
 			if("Y".equals(ordDateInfo.getBizdayYn())) {