Merge remote-tracking branch 'origin/xodud1202' into develop

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

@@ -5,8 +5,8 @@
 	<!-- 네이버페이 조회 시간(최근 3시간) -->
 	<select id="getSelectDt" resultType="Order">
 		/* TsbNaverPay.getSelectDt : 네이버페이 조회 시간(최근 3시간) */
-		SELECT CONCAT(DATE_FORMAT(NOW() + 'INTERVAL -3 HOUR', '%Y%m%d%H'), '0000') AS STDT
-			 , CONCAT(DATE_FORMAT(NOW() + 'INTERVAL -3 HOUR', '%Y%m%d%H'), '5959') AS STDT
+		SELECT CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -3 HOUR), '%Y%m%d%H'), '0000') AS STDT
+			 , CONCAT(DATE_FORMAT(NOW(), '%Y%m%d%H'), '5959') AS EDDT
 		FROM   DUAL
 	</select>