Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

into develop

Conflicts:
	src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
去掉所有日志界面关于ip的悬浮查看（已有公共方法处理）

src/main/webapp/static/pages/scripts/pageLogs.js

@@ -120,7 +120,7 @@ function aJaxImportPost(url, params) {
     // 设置form属性
     temp_form .action = url;      
     temp_form .target = "_self";
-    temp_form .method = "post";      
+    temp_form .method = "post";      R
     temp_form .style.display = "none";
     // 处理需要传递的参数 
     for (var x in params) {