diff --git a/.gitignore b/.gitignore
index 2234a709..95aa6553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /.vscode
 *.log
 .env
+.user.ini
 .phpstorm.meta.php
 .constant
 install/install.lock
diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 42653874..019eb28a 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -57,7 +57,8 @@ class Merchant extends BaseController
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader', 'street_id', 'credit_buy']);
         if (empty($where['type_id'])) {
-            $where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform];
+            //$where['type_id'] = [MerchantModel::TypeCloudWarehouse, MerchantModel::TypeStore, MerchantModel::TypeSupplyChain, MerchantModel::TypePlatform];
+            $where['type_id'] = [MerchantModel::TypeTownSupplyChain, MerchantModel::TypeStore];
         }
         return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
     }