Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

resources/views/order/issue/index.blade.php

@@ -411,7 +411,9 @@
                                         @click="removeFocusing($event)" v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
                                         <template v-if="logIndex<2||orderIssue.log_is_show===true">
                                             <td style="min-width: 200px">@{{ log.content }} </td>
-                                            <td class="text-muted" style="min-width: 120px">@{{ log.user ? log.user.mame :'' }}  </td>
+                                            <td class="text-muted" style="min-width: 120px">
+                                                <span v-if="log.user">@{{ log.user.mame}}</span>
+                                            </td>
                                             <td class="text-muted" style="min-width: 170px">@{{ log.created_at }}</td>
                                             @can('订单管理-问题件-处理结果删除')
                                                 <td style="" class="m-0 p-0 border-0">