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 @@
     var title_id = ''
 
     //语音模块
-    $('.icon-tianxie').hide()
-    $('.voice_first').hide()
-    $('.voice_second').hide()
+    // $('.icon-tianxie').hide()
+    // $('.voice_first').hide()
+    // $('.voice_second').hide()
     $('.voice_third').hide()
     $('.icon_cancle').hide()