From cdd6148f3f24a7bb2b66a545188b1fce81e73ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Mon, 20 Mar 2023 16:59:20 +0800
Subject: [PATCH] 1

---
 .../repositories/system/merchant/MerchantRepository.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 8a40eab0..155b92a4 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -254,9 +254,9 @@ class MerchantRepository extends BaseRepository
             $merchant = $this->dao->create($data);
             $make->createMerchantAccount($merchant, $account, $password);
             $address_id = Db::name('merchant_address')->insertGetId(['mer_id'=>$merchant->mer_id,'street_id'=>$data['geo_street']]);
-            if($data['area_id'] && $data['village_id']){
-                Db::name('merchant_address')->where('id',$address_id)->update(['area_id'=>$data['area_id'],'village_id'=>$data['village_id']]);
-            }
+//            if($data['area_id'] && $data['village_id']){
+//                Db::name('merchant_address')->where('id',$address_id)->update(['area_id'=>$data['area_id'],'village_id'=>$data['village_id']]);
+//            }
             app()->make(ShippingTemplateRepository::class)->createDefault($merchant->mer_id);
             app()->make(ProductCopyRepository::class)->defaulCopyNum($merchant->mer_id);
             return $merchant;