From 5ec3f531ace9b1f43adc0d5116dca1f77c4bacc3 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 7 Aug 2023 11:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0id=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/store/shipping/City.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controller/merchant/store/shipping/City.php b/app/controller/merchant/store/shipping/City.php
index 18ea4aa4..3150321c 100644
--- a/app/controller/merchant/store/shipping/City.php
+++ b/app/controller/merchant/store/shipping/City.php
@@ -61,7 +61,7 @@ class City extends BaseController
             if (!empty($v['village_id'])) {
                 $temp = [
                     'type' => 'village',
-                    'geo_id' => $v['village_id'],
+                    'id' => $v['village_id'],
                     'level' => 5,
                     'name' => $v['village_name'] ?? '',
                     'code' => $v['village_code'] ?? ''
@@ -71,7 +71,7 @@ class City extends BaseController
             if (!empty($v['street_id'])) {
                 $temp = [
                     'type' => 'street',
-                    'geo_id' => $v['street_id'],
+                    'id' => $v['street_id'],
                     'level' => 4,
                     'name' => $v['street_name'] ?? '',
                     'code' => $v['street_code'] ?? ''
@@ -81,7 +81,7 @@ class City extends BaseController
             if (!empty($v['area_id'])) {
                 $temp = [
                     'type' => 'area',
-                    'geo_id' => $v['area_id'],
+                    'id' => $v['area_id'],
                     'level' => 3,
                     'name' => $v['area_name'] ?? '',
                     'code' => $v['area_code'] ?? ''
@@ -91,7 +91,7 @@ class City extends BaseController
             if (!empty($v['city_id'])) {
                 $temp = [
                     'type' => 'city',
-                    'geo_id' => $v['city_id'],
+                    'id' => $v['city_id'],
                     'level' => 2,
                     'name' => $v['city_name'] ?? '',
                     'code' => $v['city_code'] ?? ''
@@ -101,7 +101,7 @@ class City extends BaseController
             if (!empty($v['province_id'])) {
                 $temp = [
                     'type' => 'province',
-                    'geo_id' => $v['province_id'],
+                    'id' => $v['province_id'],
                     'level' => 1,
                     'name' => $v['province_name'] ?? '',
                     'code' => $v['province_code'] ?? ''
@@ -119,7 +119,7 @@ class City extends BaseController
         foreach ($list as $v) {
             $temp = [
                 'type' => 'brigade',
-                'geo_id' => $v['id'],
+                'id' => $v['id'],
                 'level' => 6,
                 'name' => $v['brigade_name'] ?? '',
                 'code' => $v['brigade_name'] ?? ''