From d8f208553726149b5ec2f231cc5256f583c6b1ce Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Sat, 14 Nov 2020 10:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1-=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E5=92=8C=E5=BA=97=E9=93=BA=E6=B2=A1=E6=9C=89=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Repositories/v3/GoodsActivityReport.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Repositories/v3/GoodsActivityReport.php b/app/Admin/Repositories/v3/GoodsActivityReport.php
index c2d6431..85014ae 100644
--- a/app/Admin/Repositories/v3/GoodsActivityReport.php
+++ b/app/Admin/Repositories/v3/GoodsActivityReport.php
@@ -79,10 +79,10 @@ class GoodsActivityReport extends EloquentRepository
             $orderGoodsActivity->where(Model::$tableName.'.name','like',"%$name%"); 
         }
         if($marketId){
-            $orderGoodsActivity->where('market_id',$marketId); 
+            $orderGoodsActivity->where(OrderMainModel::$tableName.'.market_id',$marketId); 
         }
         if($storeId){
-            $orderGoodsActivity->where('store_id',$storeId); 
+            $orderGoodsActivity->where(OrderModel::$tableName.'.store_id',$storeId); 
         }
         if($startTime){
             $startTime = $startTime.' 00:00:00';