Merge branch 'goods_activity_1114'

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';