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

hdw

2019-01-03 bba339575f11b6922b7cadda4eca2dddaa728e08

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

   });