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

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

@@ -273,8 +273,8 @@
 								<button type="button" class="btn btn-default btn-lg" id="addExcelGoodsBtn" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
 								<button type="button" class="btn btn-default btn-lg" id="excelDownBtn" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button>
 								<button type="button" class="btn btn-success btn-lg" id="regGoodsBtn" onclick="fnSocialGoodsSave();">저장</button>
-								<button type="button" class="btn btn-danger  btn-lg" id="applyBtn" style="display:none;" onclick="fnApplyGoods();">즉시적용</button>
-								<button type="button" class="btn btn-dark btn-lg" id="endBtn" style="display:none;" onclick="fnEndSocial();">종료</button>
+								<button type="button" class="btn btn-danger  btn-lg" id="applyBtn" style="display:none;">즉시적용</button>
+								<button type="button" class="btn btn-dark btn-lg" id="endBtn" style="display:none;">종료</button>
 							</li>
 						</ul>
 						<div id="gridSocialGoodsList" style="width: 100%; height: 700px" class="ag-theme-balham lh60"></div>
@@ -963,6 +963,7 @@
 
 	var fnEndSocialCallBack = function (result){
 		console.log(result);
+		fnSearch();
 	}
 	
 /*]]>*/