Merge branch 'qs_local_mp' into develop

app/Admin/Controllers/ImsCjdcStoreController.php

@@ -27,7 +27,7 @@ class ImsCjdcStoreController extends AdminController
         if ($user->isRole('lanzu_mm')) {
             //如果登陆角色为市场经理,获取市场经理id
             $mm      = LanzuMmInfo::where(['admin_user_id' => $user->id])->first();
-            $builder = modelStore::with('market')->where(['mm_user_id' => $mm->id]);
+            $builder = modelStore::with('market')->where(['mm_user_id' => $mm->user_id]);
         }
         return Grid::make($builder, function (Grid $grid) use ($user) {
             $grid->id->sortable();