diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php index 4efab1d6..cb184416 100644 --- a/app/controller/admin/system/merchant/Merchant.php +++ b/app/controller/admin/system/merchant/Merchant.php @@ -102,7 +102,7 @@ class Merchant extends BaseController if (!empty($data['mer_phone'])) { $newUid = Db::name('User')->where('account', $data['mer_phone'])->value('uid', 0); if ($newUid) { - return app('json')->fail('该商家手机号已存在账户,请更换手机'); + //return app('json')->fail('该商家手机号已存在账户,请更换手机'); } } $this->repository->createMerchant($data); @@ -152,7 +152,7 @@ class Merchant extends BaseController $newUid = Db::name('User')->where('account', $data['mer_phone'])->value('uid', -1); $merId = Db::name('Merchant')->where('uid', $newUid)->value('mer_id', 0); if ($newUid != -1 && $id != $merId) { - return app('json')->fail('该商家手机号已存在账户,请更换手机'); + //return app('json')->fail('该商家手机号已存在账户,请更换手机'); } unset($data['mer_account'], $data['mer_password']); $margin = $this->repository->checkMargin($id, $data['type_id']);