Merge branch 'develop' into order

src/main/java/com/style24/persistence/TscPageRequest.java

@@ -1,9 +1,9 @@
 package com.style24.persistence;
 
-import lombok.Data;
-
 import java.io.Serializable;
 
+import lombok.Data;
+
 /**
  * Paging
  *
@@ -42,7 +42,8 @@ public class TscPageRequest implements Serializable {
 	}
 
 	public int getPageNo() {
-		return pageNo + 1;
+		return pageNo + 1;	// oracle
+//		return pageNo;		// mysql
 	}
 
 	public int getOffset() {

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

@@ -22,7 +22,7 @@
 		     , #{usPntAmt}
 		     , #{rmPntAmt}
 		     <if test="expBeDt != null and expBeDt != ''">
-		     , DATE_FORMAT(CONCAT(REPLACE(#{expBeDt}, '-', ''), '235959'), '%Y%m%d%H%i%S')
+		     , DATE_FORMAT(#{expBeDt}, '%Y%m%d%H%i%S')
 		     </if>
 		     , #{expCmpDt}
 		     , #{regNo}