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

src/main/java/com/style24/admin/biz/dao/TsaBusinessDao.java

@@ -14,6 +14,7 @@ import com.style24.persistence.domain.SellStore;
 import com.style24.persistence.domain.ShipCompany;
 import com.style24.persistence.domain.SiteBrand;
 import com.style24.persistence.domain.StockSyncBase;
+
 import com.style24.persistence.domain.SupplyCompany;
 
 /**

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

@@ -914,7 +914,7 @@
 						,newCustYn : $('#CouponForm select[name=newCustYn]').val()
 						,afChannel : $('#CouponForm select[name=afChannel]').val()
 						,dcCdGb : $('input:radio[name="dcCdGb"]:checked').val()
-						,rdCpnNm : $('input:radio[name="rdCpnNm"]:checked').val()
+						,rdCpnNm : $('input[name="serialCpnNm"]').val()
 						,supplyCompList : gagaAgGrid.getAllRowData(supplyGridOptions)
 						,brandList : gagaAgGrid.getAllRowData(brandGridOptions)
 						,applyGoodsList : gagaAgGrid.getAllRowData(goodsGridOptions)

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

@@ -484,7 +484,7 @@
 			// 상태명 상태에 따라 변경
 			if(freegift.freegiftStat == "G232_12") {					// 중지상태일 경우 중지 일시 노출
 				freegiftStatNm = freegiftStatNm + " (" + freegift.updDt + ")";
-			} else if (freegift.freegiftStat == "G232_11" && freegift.freegiftEddt < yyyy+"."+mm+"."+dd) {	// 종료된 프로모션일 경우 종료일 노출
+			} else if (freegift.freegiftStat == "G232_11" && freegift.freegiftEddt < yyyy+"-"+mm+"-"+dd) {	// 종료된 프로모션일 경우 종료일 노출
 				freegiftStatNm = "종료 (" + freegift.freegiftEddt + ")";
 			}
 
@@ -617,7 +617,7 @@
 			let date = new Date();
 			$("#freeGoodsPromotionForm #freegiftStDate").val(date.format("YYYY-MM-DD"));	// 오늘 날짜
 			date.setDate(date.getDate() + 7);												// 등록일 + 7일
-			$("#freeGoodsPromotionForm #freegiftStDate").val(date.format("YYYY-MM-DD"));	// 1주일 후 날짜
+			$("#freeGoodsPromotionForm #freegiftEdDate").val(date.format("YYYY-MM-DD"));	// 1주일 후 날짜
 
 			$('#freeGoodsPromotionForm #freegiftEdHH option:last').prop("selected", true);
 			$("#freeGoodsPromotionForm #freegiftEdMM option").hide();