Merge branch 'zjl_iteration_20190723' into development

resources/views/detail/content.blade.php

@@ -472,7 +472,7 @@
                         <th>货期</th>
                         
                         <!-- 15011111111和自营客服均不展示供应商列 -->
-                        @if ($user_info['mobile'] != '15011111111' && $role != 7)
+                        @if ($role != 12 && $role != 7)
                             <th>供应商</th>
                         @endif
 
@@ -512,7 +512,7 @@
 
                             <td>{{$v['delivery_time']}}</td>
 
-                            @if ($user_info['mobile'] != '15011111111' && $role != 7)
+                            @if ($role != 12 && $role != 7)
                                 <td>{{$v['supplier_name']}}</td>
                             @endif