gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除冲突标记

Browse Source
This commit is contained in:
wangxin
2018-10-19 17:52:01 +08:00
parent 04833e917c
commit eefe3b35dd
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -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>

1
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -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" %>