Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch.git into develop

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

@@ -55,9 +55,9 @@
 	</insert>
 
 	<!-- 카테고리별재고임시 테이블 truncate -->
-	<delete id="truncateTemporaryCategoryStock" >
+	<delete id="truncateTemporaryCategoryStock" timeout="300">
 		/* TsbDisplay.truncateTemporaryCategoryStock */
-		TRUNCATE TABLE TB_CATE_STOCK_TMP
+		DELETE FROM TB_CATE_STOCK_TMP
 	</delete>
 
 	<!-- 카테고리별재고 임시테이블에 생성 -->