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

Administrator

2018-12-25 26f10235fb2d6c02d6b64a0b3a8e9e3aedd0d4fd

 gx_tieta/WebRoot/Test.jsp

@@ -47,9 +47,7 @@
   <%   }   %>

   

   

   setTimeout(function() {

      voice.play("这是我第一次做语音播报在  2018-01-01 01:56:23");

   },2000);

	
   

   //上传logo

   $('#up-file1').click(function(){