Merge remote-tracking branch 'origin/develop' into card007

src/main/java/com/style24/persistence/mybatis/wms/TscWmsDelivery.xml

@@ -103,7 +103,7 @@
 			, IsCancel = CASE WHEN (Qty - Cqty) = #{itemQty} THEN 1    ELSE IsCancel END 
 			, Cqty     = CASE WHEN (SELECT COUNT(*) FROM istyle24_Wmsif.dbo.TB_IF_RecallExceptionItem B WHERE B.OrderDtlNo = #{ordDtlNo} AND B.ProductNo = #{productNo} AND B.SKUCode = #{optCd}   AND B.ReasonCode IN ('08','10') ) > 0 THEN Cqty ELSE  Cqty + #{itemQty} END
 			, DateLastModified = GETDATE()
-			, ExceptionDesc = '배송취소'
+			, ExceptionDesc = 'istyle취소'
 			WHERE 1=1
 			  <if test='ordDtlNo != null and ordDtlNo != ""'>
 			  AND OrderDtlNo = #{ordDtlNo}