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

2018-08-26 20:00:58 +08:00
parent e97cb03d22 8006664e60
commit 17996009f1
6 changed files with 24 additions and 236 deletions
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/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,//超时时间设置，查询接口时间过长超时