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

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1595,7 +1595,7 @@ public class TsfOrderService {
 
 						// 반품배송비, 교환배송비
 						sb.append("\t\t<returnShippingFee>").append(goods.getRtnDelvFee()).append("</returnShippingFee>\n");
-						sb.append("\t\t<exchangeShippingFee>").append(goods.getDelvFee() + goods.getRtnDelvFee()).append("</exchangeShippingFee>\n");
+						sb.append("\t\t<exchangeShippingFee>").append((goods.getRtnDelvFee() * 2)).append("</exchangeShippingFee>\n");
 					}
 
 					// 옵션정보 지원여부 true

src/main/resources/config/application.yml

@@ -17,6 +17,8 @@ spring:
             repositories:
                 enabled: true
 
+server.site.name: front
+
 server:
 #    servlet:
 #        session: