diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 1e2abc67..2b0e50e4 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1311,6 +1311,18 @@ class Auth extends BaseController
     //获取app版本更新信息
     public function appVersion()
     {
+        $brandArray = [
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI',
+            'HUAWEI'
+        ];
         $type = $this->request->param('type', '-1');
         $version = $this->request->param('version', '');
         $phoneBrand = $this->request->param('phone_brand', '');
diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index d29ec22d..b09087d8 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -67,19 +67,19 @@ class MerchantIntention extends BaseController
                 'id' => $intention->mer_intention_id
             ]
         ]);
-        $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find();
-        $cityId   = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0);
-        $streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0);
-        $sendData = [
-            'company_name' => $data['mer_name'],
-            'organization_code' => $data['social_credit_code'] ?? '',
-            'master_name' => $data['name'],
-            'master_phone' => $data['phone'],
-            'city' => $cityId,
-            'area' => $areaInfo['area_id'] ?? 0,
-            'street' =>  $streetId,
-            'mer_intention_id' =>  $intention->mer_intention_id
-        ];
+        // $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find();
+        // $cityId   = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0);
+        // $streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0);
+        // $sendData = [
+        //     'company_name' => $data['mer_name'],
+        //     'organization_code' => $data['social_credit_code'] ?? '',
+        //     'master_name' => $data['name'],
+        //     'master_phone' => $data['phone'],
+        //     'city' => $cityId,
+        //     'area' => $areaInfo['area_id'] ?? 0,
+        //     'street' =>  $streetId,
+        //     'mer_intention_id' =>  $intention->mer_intention_id
+        // ];
         // $res = $this->sendMerIntentionApply($sendData);
         // if (!$res) {
         //     Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete();