diff --git a/app/common/model/Feedback.php b/app/common/model/Feedback.php
index ae77aa92..f59d6212 100644
--- a/app/common/model/Feedback.php
+++ b/app/common/model/Feedback.php
@@ -38,7 +38,7 @@ class Feedback extends BaseModel
     {
         $where = [
             'merchant_id' => $merchantId,
-            'store_id' => self::$storeId
+            //'store_id' => self::$storeId
         ];
         return static::get($where, []);
     }
diff --git a/app/common/model/Goods.php b/app/common/model/Goods.php
index d883fab3..ee3459eb 100644
--- a/app/common/model/Goods.php
+++ b/app/common/model/Goods.php
@@ -433,11 +433,7 @@ class Goods extends BaseModel
                 $filter[] = ['stock_total', '=', 0];    // 已售罄
             }
         }
-<<<<<<< Updated upstream
 
-=======
-        
->>>>>>> Stashed changes
         if (isset($params['data_type']) && $params['data_type'] != "") {
             if ($params['data_type'] == 1) {
                 $filter[] = ['data_type', '=', 1];        // 出售中
@@ -448,10 +444,6 @@ class Goods extends BaseModel
             }
         }
 
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
         // 商品状态
         $params['status'] > 0 && $filter[] = ['status', '=', (int)$params['status']];
         $a = 1;