From 3bc13fee2122079839a8ae9d93f9e5c01daf59d2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 15:35:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 053cabe..c712864 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -130,7 +130,7 @@
 				<div class="cell-list control">
 					<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
 				</div>
-				<div class="cell-list server-time">					
+				<div class="cell-list server-time" style="white-space: nowrap">					
 					2018-11-26 00:00:00
 				</div>			
 			</div>

--
Gitblit v1.9.1