Merge branch 'eskim' into develop

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

@@ -352,6 +352,7 @@
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '기간', 'X');
 		var chkBeforSkipFlag = '&nbsp;&nbsp;<label class="chkBox"><input type="checkbox" name="beforSkipFlag" value="Y" >이전데이터 제외</label>';
 		$("#cardPromotionSearchForm").find('#sellTerms').append(chkBeforSkipFlag);
+		gagajf.setDate('#sellTerms','stDate', 'edDate', '7d');
 		
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);