Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

didiyu

2018-12-18 99ed6cd7dc00f90b6161fbc44fc878f18ee248c2

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

   });