From c653d80759ae497d6fe9052114ba9b6b11ae31ee Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 26 Sep 2023 15:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=BC=E5=AE=B9=E8=80=81?=
 =?UTF-8?q?=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 8a5e218c..ecf2e614 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -155,6 +155,7 @@ class MerchantIntention extends BaseController
         }
         $intenInfo = Db::name('merchant_intention')->where('mer_intention_id', $merInfo['mer_intention_id'] ?? 0)->where('type', 1)->find();
         if (empty($intenInfo)) {
+            // 兼容处理已开通商户
             $intenInfo = [
                 'uid'        => $merInfo['uid'],
                 'mer_id'     => $merInfo['mer_id'],