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

# Conflicts:
#	src/main/java/com/style24/persistence/mybatis/TsfOrder.xml

src/main/java/com/style24/persistence/mybatis/TsfOrder.xml

@@ -13,7 +13,6 @@
 		       ) ORIGINAL
 		WHERE  NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
 	</sql>
-	
-	
+	<!--// Paging -->
 
-</mapper>
+</mapper>