Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/webapp/WEB-INF/include/excel/importModal.jsp
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
增加region和service导入属性，动态控制导入业务
优化导入界面

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

@@ -471,8 +471,9 @@
 				</div>
 			</div>
 </div>
-<c:set var="importPath" value="${ctx}/ntc/iplist/list?functionId=${cfg.functionId}"/>
+<<<<<<< HEAD
+<c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
 <!-- 模板导入，start -->
-	 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
+<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>
 </html>