From 5b79cca40ac53a5d92c3065f4f0164688e86a770 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.11>
Date: 星期一, 26 十一月 2018 15:26:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-state-statistical.jsp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 013edd6..6e01c08 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -168,7 +168,7 @@
 			    ]]
 				,data:[]
 			    ,page: false
-			    ,height: 'full-280'
+			    ,height: 'full-270'
 			};
 			
 			// 鐢熸垚琛ㄦ牸鏁版嵁

--
Gitblit v1.9.1