From b8b791df46b97c724e5f2dd0319bb6f527aecd62 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期五, 30 十一月 2018 10:34:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/zzlogin1.jsp b/gx_tieta/WebRoot/zzlogin1.jsp
index 8f0c2ad..e06c62f 100644
--- a/gx_tieta/WebRoot/zzlogin1.jsp
+++ b/gx_tieta/WebRoot/zzlogin1.jsp
@@ -100,7 +100,7 @@
 	console.info(JSON.stringify(temp));
 	SendDeviceThreadInfo(temp,function(data){
 		console.info(data);
-		
+		    
 		 searchDeviceThreadInfo({dev_id:910000001});
 	});
 	

--
Gitblit v1.9.1