参数修复

biz/shop/classes/ShopClass.php

@@ -96,7 +96,7 @@ class ShopClass extends BaseClass
     //取商家所有门店 shish 2020.2.29
     public static function getAllShop($merchantId)
     {
-        return self::getAllByCondition(['merchantId' => $merchantId]);
+        return self::getAllByCondition(['merchantId' => $merchantId],null,"*");
     }
 
     //验证所属权限 shish 2020.2.29
@@ -159,4 +159,4 @@ class ShopClass extends BaseClass
         return \bizHd\admin\classes\AdminClass::getDetail($adminId);
     }
 
-}
+}