@ -79,7 +79,7 @@ class Payment extends BaseModel
* @throws \think\db\exception\DbException
* @throws \think\db\exception\DataNotFoundException
*/
public static function getAll(int $storeId, int $merchantId = 0): array
public static function getAll(int $storeId, int $merchantId = null): array
{
// 实例化当前模型
$model = new static;