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

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

@@ -325,12 +325,18 @@ function filterActionInit() {
 
 function tzheight(){
 	var hei=document.documentElement.clientHeight;
-	hei=hei-71;
+	hei=hei-91;
 	var rowheigth=0;
 	if($('.row')){
 		 rowheigth=$('.row').height();
 		 hei=hei-rowheigth;
 	}
+	if($("#messageBox")){
+		  var messageH=$("#messageBox").height();
+		     if(messageH > 0){
+		    	 hei=hei-messageH-52;
+		     }
+		}
 	if($('.table-responsive')){
 		$('.table-responsive').css({'height':hei+'px'});
 	}