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

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

@@ -2492,7 +2492,7 @@
 		     , G.CURR_PRICE 
 		     , IFNULL(GC.QTY, 1)                            AS ITEM_QTY
 		     , IFNULL(GC.COMPS_CURR_PRICE, G.CURR_PRICE)    AS ITEM_PRICE
-		     , OP.ADD_PRICE 
+		     , OP.ADD_PRICE                                 AS OPT_ADD_PRICE
 		     , CD.DISP_ORD 
 		     , 0                                            AS ORD_AMT
 		     , 0                                            AS CNCL_RTN_AMT