Merge branch 'zjl_com_name_20201113'

resources/views/orderlist/content.blade.php

@@ -440,7 +440,7 @@
                                             <a class="btn btn-info edit_erp_sn" data-oid="{{$v['order_id']}}" data-erp_sn="{{ $order_extend ? $order_extend->erp_sn : '' }}">编辑内部编码</a>
                                         @endif
 
-                                        @if ($username == 'admin@ichunt.com' && empty($order_extend->erp_sn) && $order_extend->is_manager_audit == 3)
+                                        @if ($username == 'admin@ichunt.com' && isset($order_extend) && empty($order_extend->erp_sn) && $order_extend->is_manager_audit == 3)
                                             <a class="btn btn-info syn_erp" data-oid="{{$v['order_id']}}">同步ERP</a>
                                         @endif
                                 </div>