Merge remote-tracking branch 'TSIT/ST24PRJ-131' into develop

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

@@ -536,7 +536,7 @@
 		                  , OD.CNCL_RTN_QTY
 		                  , OD.ORD_AMT
 		                  , OD.CNCL_RTN_AMT
-		                  , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
+		                  , OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
 		                  , OD.REAL_ORD_AMT
 		                  , OD.FORMAL_GB
 		                  , DATE_FORMAT(OD.DELV_ASSIGN_DT,'%Y%m%d%H%i%S') AS DELV_ASSIGN_DT