Merge remote-tracking branch 'origin/dev' into dev

app/common/repositories/store/StoreCategoryRepository.php

@@ -92,10 +92,10 @@ class StoreCategoryRepository extends BaseRepository
      * @Date: 2020/5/16
      * @return mixed
      */
-    public function getList()
+    public function getList($merId)
     {
         //$menus = $this->dao->getAllOptions(0);取消硬编码
-        $menus = $this->dao->getAllOptions( $this->request->merId());
+        $menus = $this->dao->getAllOptions($merId);
         $menus = formatCascaderData($menus, 'cate_name', 3);
         return $menus;
     }

app/controller/admin/store/StoreCategory.php

@@ -187,7 +187,8 @@ class StoreCategory extends BaseController
      */
     public function getList()
     {
-        return app('json')->success($this->repository->getList());
+        $merId = $this->request->merId();
+        return app('json')->success($this->repository->getList($merId));
     }
 
     /**