Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch into develop

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

@@ -1238,7 +1238,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 
@@ -1292,7 +1292,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew