diff --git a/app/api/controller/Controller.php b/app/api/controller/Controller.php
index 6a8965ee..e3baf3ef 100644
--- a/app/api/controller/Controller.php
+++ b/app/api/controller/Controller.php
@@ -60,6 +60,7 @@ class Controller extends BaseController
 //                throwError('很抱歉，您没有权限进入系统');
 //            }
 //        }
+
         $this->getMerchantId();
     }
 
diff --git a/app/common/model/Goods.php b/app/common/model/Goods.php
index 64873222..d883fab3 100644
--- a/app/common/model/Goods.php
+++ b/app/common/model/Goods.php
@@ -433,7 +433,11 @@ 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];        // 出售中
@@ -444,7 +448,10 @@ class Goods extends BaseModel
             }
         }
 
+<<<<<<< Updated upstream
 
+=======
+>>>>>>> Stashed changes
         // 商品状态
         $params['status'] > 0 && $filter[] = ['status', '=', (int)$params['status']];
         $a = 1;