Merge branch 'sowon' into develop

src/main/java/com/style24/batch/biz/task/TsbSocialTask.java

@@ -2,6 +2,7 @@ package com.style24.batch.biz.task;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.style24.batch.biz.job.social.TsbSocialGoodsJob;
@@ -55,7 +56,7 @@ public class TsbSocialTask {
 	 *
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "${cron.social.socialGoodsJob}") // * 0 15 10 * * ?" : 아무 요일, 매월, 매일 10:15:00 // 매시 5분 0 5 * * * *
+	@Scheduled(cron = "${cron.social.socialGoodsJob}") // * 0 15 10 * * ?" : 아무 요일, 매월, 매일 10:15:00 // 매시 5분 0 5 * * * *
 	//@Scheduled(fixedDelay=360000)
 	@Async
 	public void tsbSocialGoodsJob() throws Exception {