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

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -98,6 +98,9 @@
 				onClick="javascript:window.location='${ctx}/app/policyCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
+		<button type="button" class="btn btn-primary import" >
+				<i class="fa fa-plus"></i>
+			<spring:message code="import"></spring:message></button>
 		</shiro:hasPermission>
 	</div>
 
@@ -486,6 +489,8 @@
 				</div>
 			</div>
 </div>
-
+<c:set var="importPath" value="/app/policyCfgList?functionId=${cfg.functionId}"/>
+<!-- 模板导入，start -->
+<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>
 </html>