Merge branch 'order_delivery_1127'

app/Admin/Renderable/OrderDeliveryById.php

@@ -17,7 +17,7 @@ class OrderDeliveryById extends LazyRenderable
         $horsemanId = $this->horseman_id ?? 0;
         $startTime = $this->start_time ?? null;
         $endTime = $this->end_time ?? null;
-        $model = OrderMainModel::where('type',1)->where('shipping_type',1)->whereIn('state',OrderMainModel::ORDER_STATE_FINISH);
+        $model = OrderMainModel::where('type',1)->where('shipping_type',1)->whereIn('state',OrderMainModel::ORDER_STATE_FINISH)->where('created_at','>=',strtotime('2020-10-01 00:00:00'));;
         if($horsemanId > 0){
             $model->where('horseman_id',$horsemanId);
         }