From 0336d6a59bfa14c8df32e4ba193d318ad3b377d7 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Mon, 25 Dec 2023 17:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/store/product/ProductLabel.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/merchant/store/product/ProductLabel.php b/app/controller/merchant/store/product/ProductLabel.php
index 4aa28e59..c1a5bf66 100644
--- a/app/controller/merchant/store/product/ProductLabel.php
+++ b/app/controller/merchant/store/product/ProductLabel.php
@@ -62,7 +62,8 @@ class ProductLabel extends BaseController
         $data = $this->checkParams($validate);
         if (!$this->repository->check($data['label_name'], $this->request->merId(),$id))
             return app('json')->fail('名称重复');
-        $getOne = $this->repository->getWhere(['product_label_id' => $id,'mer_id' => $this->request->merId()]);
+        //'mer_id' => $this->request->merId()
+        $getOne = $this->repository->getWhere(['product_label_id' => $id]);
         if (!$getOne) return app('json')->fail('数据不存在');
         $this->repository->update($id, $data);
         return app('json')->success('编辑成功');