From 952421f6c15018b19c9abbc18e58fbbc0611859a Mon Sep 17 00:00:00 2001
From: guojia <445241500@qq.com>
Date: Wed, 24 Apr 2024 21:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=94=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/model/Merchant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/model/Merchant.php b/app/common/model/Merchant.php
index 90280765..0526a279 100644
--- a/app/common/model/Merchant.php
+++ b/app/common/model/Merchant.php
@@ -26,7 +26,7 @@ class Merchant extends BaseModel
     protected $name = 'merchant';
 
     // 定义主键
-    protected $pk = 'id';
+    protected $pk = 'merchant_id';
 
     /**
      * 关联logo图片