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

develop Conflicts: src/main/resources/messages/message_en.properties src/main/resources/messages/message_ru.properties src/main/resources/messages/message_zh_CN.properties 关键字日志转http url配置功能完成
2018-10-29 16:29:23 +08:00
parent 65ba7f2d7a 27575259a8
commit a30d80e64e
98 changed files with 2202 additions and 559 deletions
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -20,6 +20,7 @@
 			.attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		
 		//筛选功能
 		filterActionInit();
 	});