Merge branch 'pifa' into fxshop

app/store/model/Goods.php

@@ -312,7 +312,8 @@ class Goods extends GoodsModel
     public function getGoodsGroundingTotal(array $where = []): int
     {   
         $detail = StoreModel::where('status',1)->find();
-        $list = $this->where($where)->where('is_delete', '=', 0)->whereIn('channel',$detail['open_channel'])->where('status','=',10)->count();
+        $list = $this->where($where)->where('is_delete', '=', 0)//->whereIn('channel',$detail['open_channel'])
+                                    ->where('status','=',10)->count();
         return $list;
     }