Merge branch 'master' into release

app/Repositories/BannerRepository.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Repositories;
 use App\Models\Banner;
+use Illuminate\Support\Facades\DB;
+
 /**
  * Created by PhpStorm.
  * User: durong
@@ -25,6 +27,7 @@ class BannerRepository
             ->select('image', 'type', 'link_content_id')
             ->where($where)
             ->whereIn('id', $ids)
+            ->orderByRaw(DB::raw("FIELD(id,{$request['ids']})"))
             ->get();
     }