合并冲突修改

app/Http/Controllers/TestController.php

@@ -88,9 +88,11 @@ class TestController extends Controller
 
     public function test()
     {
-        $a = 1;
-        if ($a>2)dd(1);
-        else if($a==0)dd(2);
-        dd(3);
+        dd(Waybill::query()->where("created_at",">=","2021-08-31 00:00:00")
+            ->where("owner_id",3)->where("origination","松江泗砖仓")
+            ->where("type","德邦物流")
+            ->update([
+            "origination" => "松江区九干仓"
+        ]));
     }
 }

app/Http/Controllers/WaybillController.php

@@ -812,7 +812,6 @@ SQL;
     public function loadData(Request $request)
     {
         if (!Auth::user())$this->error("登录信息失效");
-        $this->success($this->deliveringQuery($request)->limit(10)->orderByDesc("id")->get());
         $this->success($this->deliveringQuery($request)->orderByDesc("id")->get());
     }
     //承运商提交