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

# Conflicts:
#	public/themes/simpleboot3/user/index/inquiry.html

@@ -295,7 +295,7 @@
     margin-top: 0.2rem;
 }
 .voice_box{
-    width:6.86rem;
+    /*width:6.86rem;*/
     height:1.2rem;
     background:rgba(255,255,255,1);
     box-shadow:0 0.08rem 0.16rem 0 rgba(6,33,65,0.08);