Merged PR 70: 옵션표기형식변경하기위해colonm select 추가

옵션표기형식변경하기위해colonm select 추가

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

@@ -41,6 +41,7 @@
 		             , ODI.OPT_CD
 		             , ODI.OPT_CD1
 		             , ODI.OPT_CD2
+		             , 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
 		             , ODI.ITEM_QTY
 		             , OD.ORD_QTY
 		             , OD.CNCL_RTN_QTY