Merge branch 'qs_local_mp' into develop

app/Admin/Controllers/ImsCjdcStoreController.php

@@ -30,6 +30,7 @@ class ImsCjdcStoreController extends AdminController
             $builder = modelStore::with('market')->where(['mm_user_id' => $mm->user_id]);
         }
         return Grid::make($builder, function (Grid $grid) use ($user) {
+            $grid->paginate(10);
             $grid->id->sortable();
             $grid->name;
             $grid->column('market.name', '所属市场');

app/Admin/routes.php

@@ -19,7 +19,7 @@ Route::group([
     $router->any('/mp_data', 'LanzuMpInfoController@showData');
     $router->resource('/mm', 'LanzuMmInfoController');
     $router->resource('/market', 'ImsCjdcMarketController');
-    $router->resource('/store', 'ImsCjdcStoreController');
+    $router->resource('/stores', 'ImsCjdcStoreController');
     $router->resource('/mp_withdraw', 'LanzuMpWithdrawController');
     $router->resource('/mm_withdraw', 'LanzuMmWithdrawController');
     $router->resource('/cs', 'LanzuCsInfoController');