证书校验国际化增加

2018-10-20 13:41:26 +08:00
parent 04833e917c
commit 8abadf0ccb
7 changed files with 32 additions and 6 deletions
--- 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" %>