Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-12-26 dc5787e63710d307c5e7983a2148527425543730

 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});

   });