From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@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