名字修改

application/admin/controller/Order.php

@@ -59,7 +59,7 @@ class Order extends Backend
             }
 
             $list = $this->model
-                    ->with(['company','staff','user','preOrder','servicetype'])
+                    ->with(['company','staff','user','preorder','servicetype'])
                     ->where($where)
                     ->where($where_op)
                     ->order($sort, $order)
@@ -69,7 +69,7 @@ class Order extends Backend
                 $row->getRelation('company')->visible(['name']);
 				$row->getRelation('staff')->visible(['truename','mobile']);
 				$row->getRelation('user')->visible(['nickname','mobile']);
-				$row->getRelation('pre_order')->visible(['pre_order_no']);
+				$row->getRelation('preorder')->visible(['pre_order_no']);
 				$row->getRelation('servicetype')->visible(['title']);
             }
 

application/admin/model/Order.php

@@ -168,9 +168,9 @@ class Order extends Model
     }
 
 
-    public function preOrder()
+    public function preorder()
     {
-        return $this->belongsTo('app\admin\model\PreOrder', 'pre_order_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('app\admin\model\Preorder', 'pre_order_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }