From c32ced1c0ec35c1c1d4a3231d99ae79b8432b064 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 24 May 2024 17:00:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E4=BA=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=A0=87=E7=AD=BE=E6=96=87=E6=9C=AC=E7=9A=84=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/merchat/MerchantController.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/admin/controller/merchat/MerchantController.php b/app/admin/controller/merchat/MerchantController.php
index a021f2f..4995b4e 100644
--- a/app/admin/controller/merchat/MerchantController.php
+++ b/app/admin/controller/merchat/MerchantController.php
@@ -205,12 +205,7 @@ class MerchantController extends BaseAdminController
         }
         $data = Db::name('merchant_bind_goods')->where('mer_id', $mer_id)->page($page_no, $page_size)->select()->each(function ($item) {
             $item['goods_info'] = Goods::where('id', $item['goods_id'])->with(['className', 'brandName', 'unitName', 'warehouseName'])->findOrEmpty();
-            if (!empty($item['goods_info']['sys_labels'])) {
-                $goodslabel = GoodsLabel::where('id', 'in', trim($item['goods_info']['sys_labels'], ','))->column('name');
-                $item['goods_info']['sys_labels_text'] = implode(',', $goodslabel);
-            } else {
-                $item['goods_info']['sys_labels_text'] = '';
-            }
+            $item['goods_info']['sys_labels_text'] = '';
             return $item;
         })->toArray();
         $count = Db::name('merchant_bind_goods')->where('mer_id', $mer_id)->count();