From fb6be5b1f4dc471a16196f734c98e3717100e660 Mon Sep 17 00:00:00 2001
From: lqmac <lqmac@qq.com>
Date: Fri, 7 Jun 2024 23:38:56 +0800
Subject: [PATCH] 1

---
 app/common/model/Goods.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/common/model/Goods.php b/app/common/model/Goods.php
index a27997f7..f68e8954 100644
--- a/app/common/model/Goods.php
+++ b/app/common/model/Goods.php
@@ -503,7 +503,11 @@ class Goods extends BaseModel
         if (isset($param['spec_type']) && $param['spec_type'] !== '') {
             $filter[] = ['spec_type', '=', $params['spec_type']];
         }
-        //gj
+        //gj -前台小程序
+        if (isset($param['merchantId']) && $param['merchantId']) {
+            $filter[] = ['goods.merchant_id', '=', $param['merchantId']];
+        }
+        //后台管理
         if (isset($param['merchant_id']) && $param['merchant_id']) {
             $filter[] = ['goods.merchant_id', '=', $param['merchant_id']];
         }