Merge branch 'returnOption' into develop

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

@@ -1218,6 +1218,7 @@
 		     , A.GOODS_TYPE_NM
 		     , A.SYS_IMG_NM
 		     , A.BRAND_ENM
+		     , A.SKU_MODEL_NO
 		     , GROUP_CONCAT(A.ITEM_NM ORDER BY A.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		     , GROUP_CONCAT(A.ITEM_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_CD
 		     , GROUP_CONCAT(A.OPT_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD
@@ -1283,6 +1284,7 @@
 		         , (SELECT Z.BRAND_ENM
 		            FROM   TB_BRAND Z
 		            WHERE  Z.BRAND_CD = G1.BRAND_CD) AS BRAND_ENM
+		         , ODI.SKU_MODEL_NO
 		         , G2.GOODS_CD                             AS ITEM_CD
 		         , G2.GOODS_NM                             AS ITEM_NM
 		         , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN  = 'Y'), ODI.OPT_CD1) AS COLOR_NM
@@ -1426,6 +1428,7 @@
 		     , A.GOODS_TYPE_NM
 		     , A.SYS_IMG_NM
 		     , A.BRAND_ENM
+		     , A.SKU_MODEL_NO
 		     , A.LIST_PRICE
 		     , A.CURR_PRICE
 		     , A.ORD_QTY

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

@@ -5188,6 +5188,7 @@
 		  ON O.ORD_NO = DF.ORD_NO
 		  INNER JOIN TB_DELV_FEE_POLICY DFP
 		  ON OD.DELV_FEE_CD = DFP.DELV_FEE_CD
+		 AND OD.SUPPLY_COMP_CD = DFP.SUPPLY_COMP_CD
 		 WHERE O.ORD_NO = #{ordNo}
 		   AND OD.DELV_FEE_CD = #{delvFeeCd}
 	</select>