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

src/main/resources/config/application-locd.yml

@@ -22,6 +22,7 @@ domain:
     batch: //ldbatch.style24.com
     image: //ldimage.style24.com
     uximage: //ldadmin.style24.com
+    scm: //ldscm.style24.com
 
 upload:
     dext.target.path: /WIDE/workspace/files/data/style24/dext

src/main/resources/config/application-style.yml

@@ -34,6 +34,7 @@ domain:
     batch: //batch.style24.com
     image: //image.istyle24.com/Upload
     uximage: //bos.style24.com
+    scm: //scm.style24.com
 
 upload:
     dext.target.path: /files/data/style24/dext

src/main/resources/config/application-tsit.yml

@@ -24,6 +24,7 @@ domain:
 #    cdnimage: //tdimage.style24.com
     cdnimage: //ts5000.ipdisk.co.kr:8999
     uximage: //tdadmin.style24.com
+    scm: //tdscm.style24.com
 
 upload:
     dext.target.path: /TSIT/servers/files/data/style24/dext

src/main/resources/config/application.yml

@@ -12,6 +12,8 @@ spring:
             max-file-size: 30MB
             max-request-size: 30MB
 
+server.site.name: bos
+
 server.error.whitelabel.enabled: false
 
 # Instagram

src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionRegiForm.html

@@ -680,6 +680,7 @@
 				if(eval("gridListValue[j]." + key) == eval("result[i]." + key)) {	addChk = false;	}		// 중복체크
 			}
 
+			// 딜상품은 추가 불가. 구성상품으로 추가할것.
 			if(key == "goodsCd" && result[i].goodsType == "G056_D") {
 				if(dealCntString == "") {
 					dealCntString = "<br/>딜 상품은 추가 될 수 없습니다. 구성상품으로 등록해주세요.";