From eefe3b35dd903f5645fea5c2a69ee86e72c7246c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Fri, 19 Oct 2018 17:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=B2=E7=AA=81=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/excel/importModal.jsp         | 1 -
 src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp | 3 +--
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp           | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index e42866eac..b0cca3eb3 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -2,7 +2,6 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%> 
 <script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
 <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
-<<<<<<< HEAD
 	<form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
 		onsubmit="loading('<spring:message code='loading'/>');">
 		
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index c1794157e..f8b1ceb56 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -536,8 +536,7 @@
 				</div>
 			</div>
 </div>
-<c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list"/>
-<c:set var="functionId" value="${cfg.functionId}"/>
+<c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list?functionId=${cfg.functionId}"/>
 <!-- 模板导入，start -->
 	 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 945f17792..cd3c74b11 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -471,7 +471,6 @@
 				</div>
 			</div>
 </div>
-<<<<<<< HEAD
 <c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
 <!-- 模板导入，start -->
 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>