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

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}