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

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

@@ -105,7 +105,9 @@
 		                 , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
 		                 , P.PG_GB
 		                 , P.PAY_MEANS
-		                 , FN_GET_CODE_NM('G014', P.PAY_MEANS  ) AS PAY_MEANS_NM
+		                 , CASE WHEN P.PG_GB = 'KCP' THEN FN_GET_CODE_NM('G014', P.PAY_MEANS)
+		                        WHEN P.PG_GB = 'ISTYLE' THEN '상품권'
+		                        ELSE FN_GET_CODE_NM('G015', P.PG_GB) END AS PAY_MEANS_NM
 		                 , O.ORD_PHNNO
 		                 , DA.RECIP_NM
 		                 , DA.RECIP_PHNNO