Merge branch 'style' into ST24PRJ-133

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

@@ -458,7 +458,9 @@
 		     , IFNULL(GS.REVIEW_REG_CNT,0)                            AS REVIEW_COUNT              /*상품평수*/
 		     , IFNULL(CASE WHEN DFP.DELV_FEE_CRITE = 'G078_20' /*무료*/ THEN
 		                       0
-		                   ELSE /*조건부무료 또는 유료*/
+		                   WHEN DFP.DELV_FEE_CRITE = 'G078_30' /*유료*/ THEN
+		                       DFP.DELV_FEE
+		                   ELSE /*조건부무료*/
 		                       CASE WHEN DFP.MIN_ORD_AMT <![CDATA[<=]]> IFNULL(GBP.PC_CURR_PRICE,G.CURR_PRICE) * G.MIN_ORD_QTY THEN
 		                                0
 		                            ELSE
@@ -1301,7 +1303,9 @@
 		     , CONCAT('',G.PNT_PRATE)                                                                              AS POINT      /*포인트율*/
 		     , IFNULL(CASE WHEN DFP.DELV_FEE_CRITE = 'G078_20' /*무료*/ THEN
 		                       0
-		                   ELSE /*조건부무료 또는 유료*/
+		                   WHEN DFP.DELV_FEE_CRITE = 'G078_30' /*유료*/ THEN
+		                       DFP.DELV_FEE
+		                   ELSE /*조건부무료*/
 		                       CASE WHEN DFP.MIN_ORD_AMT <![CDATA[<=]]> IFNULL(GBP.PC_CURR_PRICE,G.CURR_PRICE) * G.MIN_ORD_QTY THEN
 		                                0
 		                            ELSE