From be1267c82755ea2217e3e84d6b47661eaf075497 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 25 九月 2018 16:04:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/css/control_style.css |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/css/control_style.css b/gx_tieta/WebRoot/css/control_style.css
index 262e1f4..db48907 100644
--- a/gx_tieta/WebRoot/css/control_style.css
+++ b/gx_tieta/WebRoot/css/control_style.css
@@ -55,7 +55,6 @@
 	width: 100%;
 	height:460px;
 	background: white;
-	overflow:scroll;
 	position: relative;
 }
 #lside>ul{

--
Gitblit v1.9.1