From 6c1ff9a3549fcc5d1a2e141686f9edeef5849677 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 25 May 2024 10:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=8F=E9=94=80=E5=95=86?=
 =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/shop/IndexController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/controller/shop/IndexController.php b/app/api/controller/shop/IndexController.php
index 600be4b..085617a 100644
--- a/app/api/controller/shop/IndexController.php
+++ b/app/api/controller/shop/IndexController.php
@@ -65,6 +65,7 @@ class IndexController extends BaseApiController{
 	    
         if($post['is_merchant_type']==1){
             if($find){
+				$post['mer_id'] = $find['pid'];
                 $res=MerchantLogic::edit($post);
                 Db::name('user_auth_shop')->where('id',$find['id'])->update(['apply_status'=>0,'mark'=>'']);
             }else{