作者 刘晓艳

Merge branch 'master' of http://114.215.101.231:8099/root/jyht into liuxiaoyan

# Conflicts:
#	public/themes/simpleboot3/user/index/inquiry.html
@@ -329,9 +329,9 @@ @@ -329,9 +329,9 @@
329 var title_id = '' 329 var title_id = ''
330 330
331 //语音模块 331 //语音模块
332 - $('.icon-tianxie').hide()  
333 - $('.voice_first').hide()  
334 - $('.voice_second').hide() 332 + // $('.icon-tianxie').hide()
  333 + // $('.voice_first').hide()
  334 + // $('.voice_second').hide()
335 $('.voice_third').hide() 335 $('.voice_third').hide()
336 $('.icon_cancle').hide() 336 $('.icon_cancle').hide()
337 337