Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js

@@ -64,6 +64,7 @@
 		hexCheck:"Please enter the HEX format character",
 		invisibleChar:"Please enter the visible character",
 		hasInvisibleChar:"The tag {0} has invisible character",
-		haveInvisibleChar:"The tags {0} have invisible character"
+		haveInvisibleChar:"The tags {0} have invisible character",
+		failed:"Failed"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

@@ -64,6 +64,7 @@
 		hexCheck:"请输入十六进制字符",
 		invisibleChar:"请输入可见字符",
 		hasInvisibleChar:"标签{0}包含不可见字符",
-		haveInvisibleChar:"标签{0}包含不可见字符"
+		haveInvisibleChar:"标签{0}包含不可见字符",
+		failed:"获取失败"
 	});
 }(jQuery));

src/main/webapp/static/global/scripts/common.js

@@ -1183,6 +1183,7 @@ var GetLogTotal=function(_data){
 	}
 	var totalTrs=$(_data.objs);
 	var timeout=$.validator.messages.timeout;
+	var failed=$.validator.messages.failed;
 	var request=$.ajax({
 		type:'post',
 		timeout:10000,//超时时间设置，查询接口时间过长超时