1

api/EntArea.proto

@@ -30,7 +30,20 @@ message AreaEnt{
 
 message AreaLevelEnt {
   // 区域信息
-  AreaEnt area_info = 1;
+  // 省编号
+  string province_code = 1;
+  // 省名称
+  string province_name = 2;
+  // 市编号
+  string city_code = 3;
+  // 市名称
+  string city_name = 4;
+  // 区编号
+  string area_code = 5;
+  // 区名称
+  string area_name = 6;
+  // 地区code
+  string area_id = 7;
   // 子级区域
-  repeated AreaLevelEnt children = 2;
+  repeated AreaLevelEnt children = 8;
 }

api/EntCityPackage.proto

@@ -60,7 +60,7 @@ message CityPackageEnt {
   // 电池标签信息
   EntTag battery_tag_info = 4;
   // 车型信息
-  CarModelEnt car_model_info = 5;
+  EntTag car_tag_info = 5;
   // 门店信息
   EntAdmin shop_info = 6;
   // 是否是推荐

api/EntTag.proto

@@ -14,9 +14,11 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 
 message EntTag {
   // 标签名称
-  string name = 1;
+  string tag_name = 1;
   // 标签code
   string tag_code = 2;
   // 标签类型
   DEVICE_USE_TYPE tag_type = 3;
+  // tag的图片
+  repeated string tag_images = 4;
 }

gen/php/GPBMetadata/Api/EntArea.php

@@ -17,7 +17,7 @@ class EntArea
         }
         \GPBMetadata\ProtocGenOpenapiv2\Options\Annotations::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xEB\x02\x0A\x11api/EntArea.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\"\x94\x01\x0A\x07AreaEnt\x12\x15\x0A\x0Dprovince_code\x18\x01 \x01(\x09\x12\x15\x0A\x0Dprovince_name\x18\x02 \x01(\x09\x12\x11\x0A\x09city_code\x18\x03 \x01(\x09\x12\x11\x0A\x09city_name\x18\x04 \x01(\x09\x12\x11\x0A\x09area_code\x18\x05 \x01(\x09\x12\x11\x0A\x09area_name\x18\x06 \x01(\x09\x12\x0F\x0A\x07area_id\x18\x07 \x01(\x09\"`\x0A\x0CAreaLevelEnt\x12%\x0A\x09area_info\x18\x01 \x01(\x0B2\x12.proto.api.AreaEnt\x12)\x0A\x08children\x18\x02 \x03(\x0B2\x17.proto.api.AreaLevelEntB(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE5\x9C\xB0\xE5\x8C\xBA\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xD0\x03\x0A\x11api/EntArea.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\"\x94\x01\x0A\x07AreaEnt\x12\x15\x0A\x0Dprovince_code\x18\x01 \x01(\x09\x12\x15\x0A\x0Dprovince_name\x18\x02 \x01(\x09\x12\x11\x0A\x09city_code\x18\x03 \x01(\x09\x12\x11\x0A\x09city_name\x18\x04 \x01(\x09\x12\x11\x0A\x09area_code\x18\x05 \x01(\x09\x12\x11\x0A\x09area_name\x18\x06 \x01(\x09\x12\x0F\x0A\x07area_id\x18\x07 \x01(\x09\"\xC4\x01\x0A\x0CAreaLevelEnt\x12\x15\x0A\x0Dprovince_code\x18\x01 \x01(\x09\x12\x15\x0A\x0Dprovince_name\x18\x02 \x01(\x09\x12\x11\x0A\x09city_code\x18\x03 \x01(\x09\x12\x11\x0A\x09city_name\x18\x04 \x01(\x09\x12\x11\x0A\x09area_code\x18\x05 \x01(\x09\x12\x11\x0A\x09area_name\x18\x06 \x01(\x09\x12\x0F\x0A\x07area_id\x18\x07 \x01(\x09\x12)\x0A\x08children\x18\x08 \x03(\x0B2\x17.proto.api.AreaLevelEntB(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE5\x9C\xB0\xE5\x8C\xBA\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
         , true);
 
         static::$is_initialized = true;

gen/php/GPBMetadata/Api/EntCityPackage.php

@@ -25,7 +25,7 @@ class EntCityPackage
         \GPBMetadata\Api\EntAdmin::initOnce();
         \GPBMetadata\Api\EntCarModel::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xC8\x08\x0A\x18api/EntCityPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x11api/EntArea.proto\x1A\x14api/EntPackage.proto\x1A\x10api/Common.proto\x1A\x12api/EntOrder.proto\x1A\x10api/EntTag.proto\x1A\x13api/EntCommon.proto\x1A\x12api/EntAdmin.proto\x1A\x15api/EntCarModel.proto\"8\x0A\x11CityPackageTagEnt\x12#\x0A\x08tag_info\x18\x01 \x01(\x0B2\x11.proto.api.EntTag\"\xBF\x02\x0A\x13CityPackageOrderEnt\x12@\x0A\x0Aorder_info\x18\x01 \x01(\x0B2,.proto.api.CityPackageOrderEnt.OrderInfoItem\x12\x16\x0A\x0Einsurance_info\x18\x02 \x01(\x09\x124\x0A\x11city_package_info\x18\x03 \x01(\x0B2\x19.proto.api.CityPackageEnt\x1A\x97\x01\x0A\x0DOrderInfoItem\x12&\x0A\x09base_info\x18\x01 \x01(\x0B2\x13.proto.api.EntOrder\x12\x1A\x0A\x12current_battery_sn\x18\x02 \x01(\x09\x12\x12\x0A\x0Abattery_sn\x18\x03 \x01(\x09\x12\x17\x0A\x0Fremain_capacity\x18\x04 \x01(\x09\x12\x15\x0A\x0Dpledge_status\x18\x05 \x01(\x05\"\xC8\x02\x0A\x0ECityPackageEnt\x12+\x0A\x0Cpackage_info\x18\x01 \x01(\x0B2\x15.proto.api.EntPackage\x124\x0A\x10package_category\x18\x02 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12%\x0A\x09area_list\x18\x03 \x03(\x0B2\x12.proto.api.AreaEnt\x12+\x0A\x10battery_tag_info\x18\x04 \x01(\x0B2\x11.proto.api.EntTag\x12.\x0A\x0Ecar_model_info\x18\x05 \x01(\x0B2\x16.proto.api.CarModelEnt\x12&\x0A\x09shop_info\x18\x06 \x01(\x0B2\x13.proto.api.EntAdmin\x12'\x0A\x0Cis_recommend\x18\x07 \x01(\x0E2\x11.proto.api.YES_NO\"_\x0A\x0EPackageAreaEnt\x12%\x0A\x09area_info\x18\x01 \x01(\x0B2\x12.proto.api.AreaEnt\x12&\x0A\x0Bopen_status\x18\x02 \x01(\x0E2\x11.proto.api.YES_NOB.Z\x06api/v1\x92A#\x12!\x0A\x12\xE5\x9F\x8E\xE5\xB8\x82\xE5\xA5\x97\xE9\xA4\x90\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xC1\x08\x0A\x18api/EntCityPackage.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x11api/EntArea.proto\x1A\x14api/EntPackage.proto\x1A\x10api/Common.proto\x1A\x12api/EntOrder.proto\x1A\x10api/EntTag.proto\x1A\x13api/EntCommon.proto\x1A\x12api/EntAdmin.proto\x1A\x15api/EntCarModel.proto\"8\x0A\x11CityPackageTagEnt\x12#\x0A\x08tag_info\x18\x01 \x01(\x0B2\x11.proto.api.EntTag\"\xBF\x02\x0A\x13CityPackageOrderEnt\x12@\x0A\x0Aorder_info\x18\x01 \x01(\x0B2,.proto.api.CityPackageOrderEnt.OrderInfoItem\x12\x16\x0A\x0Einsurance_info\x18\x02 \x01(\x09\x124\x0A\x11city_package_info\x18\x03 \x01(\x0B2\x19.proto.api.CityPackageEnt\x1A\x97\x01\x0A\x0DOrderInfoItem\x12&\x0A\x09base_info\x18\x01 \x01(\x0B2\x13.proto.api.EntOrder\x12\x1A\x0A\x12current_battery_sn\x18\x02 \x01(\x09\x12\x12\x0A\x0Abattery_sn\x18\x03 \x01(\x09\x12\x17\x0A\x0Fremain_capacity\x18\x04 \x01(\x09\x12\x15\x0A\x0Dpledge_status\x18\x05 \x01(\x05\"\xC1\x02\x0A\x0ECityPackageEnt\x12+\x0A\x0Cpackage_info\x18\x01 \x01(\x0B2\x15.proto.api.EntPackage\x124\x0A\x10package_category\x18\x02 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12%\x0A\x09area_list\x18\x03 \x03(\x0B2\x12.proto.api.AreaEnt\x12+\x0A\x10battery_tag_info\x18\x04 \x01(\x0B2\x11.proto.api.EntTag\x12'\x0A\x0Ccar_tag_info\x18\x05 \x01(\x0B2\x11.proto.api.EntTag\x12&\x0A\x09shop_info\x18\x06 \x01(\x0B2\x13.proto.api.EntAdmin\x12'\x0A\x0Cis_recommend\x18\x07 \x01(\x0E2\x11.proto.api.YES_NO\"_\x0A\x0EPackageAreaEnt\x12%\x0A\x09area_info\x18\x01 \x01(\x0B2\x12.proto.api.AreaEnt\x12&\x0A\x0Bopen_status\x18\x02 \x01(\x0E2\x11.proto.api.YES_NOB.Z\x06api/v1\x92A#\x12!\x0A\x12\xE5\x9F\x8E\xE5\xB8\x82\xE5\xA5\x97\xE9\xA4\x90\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
         , true);
 
         static::$is_initialized = true;

gen/php/GPBMetadata/Api/EntTag.php

@@ -18,7 +18,7 @@ class EntTag
         \GPBMetadata\ProtocGenOpenapiv2\Options\Annotations::initOnce();
         \GPBMetadata\Api\Common::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xDB\x01\x0A\x10api/EntTag.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x10api/Common.proto\"V\x0A\x06EntTag\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\x10\x0A\x08tag_code\x18\x02 \x01(\x09\x12,\x0A\x08tag_type\x18\x03 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPEB(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE6\xA0\x87\xE7\xAD\xBE\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
+            "\x0A\xF3\x01\x0A\x10api/EntTag.proto\x12\x09proto.api\x1A google/protobuf/descriptor.proto\x1A\x10api/Common.proto\"n\x0A\x06EntTag\x12\x10\x0A\x08tag_name\x18\x01 \x01(\x09\x12\x10\x0A\x08tag_code\x18\x02 \x01(\x09\x12,\x0A\x08tag_type\x18\x03 \x01(\x0E2\x1A.proto.api.DEVICE_USE_TYPE\x12\x12\x0A\x0Atag_images\x18\x04 \x03(\x09B(Z\x06api/v1\x92A\x1D\x12\x1B\x0A\x0C\xE6\xA0\x87\xE7\xAD\xBE\xE5\xAE\x9E\xE4\xBD\x93\x12\x06\xE5\xAE\x9E\xE4\xBD\x932\x031.0b\x06proto3"
         , true);
 
         static::$is_initialized = true;

gen/php/Proto/Api/AreaLevelEnt.php

@@ -16,14 +16,51 @@ class AreaLevelEnt extends \Google\Protobuf\Internal\Message
 {
     /**
      * 区域信息
+     * 省编号
      *
-     * Generated from protobuf field <code>.proto.api.AreaEnt area_info = 1;</code>
+     * Generated from protobuf field <code>string province_code = 1;</code>
      */
-    protected $area_info = null;
+    protected $province_code = '';
+    /**
+     * 省名称
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     */
+    protected $province_name = '';
+    /**
+     * 市编号
+     *
+     * Generated from protobuf field <code>string city_code = 3;</code>
+     */
+    protected $city_code = '';
+    /**
+     * 市名称
+     *
+     * Generated from protobuf field <code>string city_name = 4;</code>
+     */
+    protected $city_name = '';
+    /**
+     * 区编号
+     *
+     * Generated from protobuf field <code>string area_code = 5;</code>
+     */
+    protected $area_code = '';
+    /**
+     * 区名称
+     *
+     * Generated from protobuf field <code>string area_name = 6;</code>
+     */
+    protected $area_name = '';
+    /**
+     * 地区code
+     *
+     * Generated from protobuf field <code>string area_id = 7;</code>
+     */
+    protected $area_id = '';
     /**
      * 子级区域
      *
-     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 2;</code>
+     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 8;</code>
      */
     private $children;
 
@@ -33,8 +70,21 @@ class AreaLevelEnt extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
-     *     @type \Proto\Api\AreaEnt $area_info
+     *     @type string $province_code
      *           区域信息
+     *           省编号
+     *     @type string $province_name
+     *           省名称
+     *     @type string $city_code
+     *           市编号
+     *     @type string $city_name
+     *           市名称
+     *     @type string $area_code
+     *           区编号
+     *     @type string $area_name
+     *           区名称
+     *     @type string $area_id
+     *           地区code
      *     @type array<\Proto\Api\AreaLevelEnt>|\Google\Protobuf\Internal\RepeatedField $children
      *           子级区域
      * }
@@ -46,36 +96,184 @@ class AreaLevelEnt extends \Google\Protobuf\Internal\Message
 
     /**
      * 区域信息
+     * 省编号
+     *
+     * Generated from protobuf field <code>string province_code = 1;</code>
+     * @return string
+     */
+    public function getProvinceCode()
+    {
+        return $this->province_code;
+    }
+
+    /**
+     * 区域信息
+     * 省编号
+     *
+     * Generated from protobuf field <code>string province_code = 1;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setProvinceCode($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->province_code = $var;
+
+        return $this;
+    }
+
+    /**
+     * 省名称
      *
-     * Generated from protobuf field <code>.proto.api.AreaEnt area_info = 1;</code>
-     * @return \Proto\Api\AreaEnt|null
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     * @return string
      */
-    public function getAreaInfo()
+    public function getProvinceName()
     {
-        return $this->area_info;
+        return $this->province_name;
     }
 
-    public function hasAreaInfo()
+    /**
+     * 省名称
+     *
+     * Generated from protobuf field <code>string province_name = 2;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setProvinceName($var)
     {
-        return isset($this->area_info);
+        GPBUtil::checkString($var, True);
+        $this->province_name = $var;
+
+        return $this;
     }
 
-    public function clearAreaInfo()
+    /**
+     * 市编号
+     *
+     * Generated from protobuf field <code>string city_code = 3;</code>
+     * @return string
+     */
+    public function getCityCode()
     {
-        unset($this->area_info);
+        return $this->city_code;
     }
 
     /**
-     * 区域信息
+     * 市编号
+     *
+     * Generated from protobuf field <code>string city_code = 3;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCityCode($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->city_code = $var;
+
+        return $this;
+    }
+
+    /**
+     * 市名称
+     *
+     * Generated from protobuf field <code>string city_name = 4;</code>
+     * @return string
+     */
+    public function getCityName()
+    {
+        return $this->city_name;
+    }
+
+    /**
+     * 市名称
+     *
+     * Generated from protobuf field <code>string city_name = 4;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setCityName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->city_name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 区编号
+     *
+     * Generated from protobuf field <code>string area_code = 5;</code>
+     * @return string
+     */
+    public function getAreaCode()
+    {
+        return $this->area_code;
+    }
+
+    /**
+     * 区编号
+     *
+     * Generated from protobuf field <code>string area_code = 5;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setAreaCode($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->area_code = $var;
+
+        return $this;
+    }
+
+    /**
+     * 区名称
+     *
+     * Generated from protobuf field <code>string area_name = 6;</code>
+     * @return string
+     */
+    public function getAreaName()
+    {
+        return $this->area_name;
+    }
+
+    /**
+     * 区名称
+     *
+     * Generated from protobuf field <code>string area_name = 6;</code>
+     * @param string $var
+     * @return $this
+     */
+    public function setAreaName($var)
+    {
+        GPBUtil::checkString($var, True);
+        $this->area_name = $var;
+
+        return $this;
+    }
+
+    /**
+     * 地区code
+     *
+     * Generated from protobuf field <code>string area_id = 7;</code>
+     * @return string
+     */
+    public function getAreaId()
+    {
+        return $this->area_id;
+    }
+
+    /**
+     * 地区code
      *
-     * Generated from protobuf field <code>.proto.api.AreaEnt area_info = 1;</code>
-     * @param \Proto\Api\AreaEnt $var
+     * Generated from protobuf field <code>string area_id = 7;</code>
+     * @param string $var
      * @return $this
      */
-    public function setAreaInfo($var)
+    public function setAreaId($var)
     {
-        GPBUtil::checkMessage($var, \Proto\Api\AreaEnt::class);
-        $this->area_info = $var;
+        GPBUtil::checkString($var, True);
+        $this->area_id = $var;
 
         return $this;
     }
@@ -83,7 +281,7 @@ class AreaLevelEnt extends \Google\Protobuf\Internal\Message
     /**
      * 子级区域
      *
-     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 2;</code>
+     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 8;</code>
      * @return \Google\Protobuf\Internal\RepeatedField
      */
     public function getChildren()
@@ -94,7 +292,7 @@ class AreaLevelEnt extends \Google\Protobuf\Internal\Message
     /**
      * 子级区域
      *
-     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 2;</code>
+     * Generated from protobuf field <code>repeated .proto.api.AreaLevelEnt children = 8;</code>
      * @param array<\Proto\Api\AreaLevelEnt>|\Google\Protobuf\Internal\RepeatedField $var
      * @return $this
      */

gen/php/Proto/Api/CityPackageEnt.php

@@ -43,9 +43,9 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 车型信息
      *
-     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 5;</code>
+     * Generated from protobuf field <code>.proto.api.EntTag car_tag_info = 5;</code>
      */
-    protected $car_model_info = null;
+    protected $car_tag_info = null;
     /**
      * 门店信息
      *
@@ -73,7 +73,7 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
      *           支持的区县ID列表
      *     @type \Proto\Api\EntTag $battery_tag_info
      *           电池标签信息
-     *     @type \Proto\Api\CarModelEnt $car_model_info
+     *     @type \Proto\Api\EntTag $car_tag_info
      *           车型信息
      *     @type \Proto\Api\EntAdmin $shop_info
      *           门店信息
@@ -213,35 +213,35 @@ class CityPackageEnt extends \Google\Protobuf\Internal\Message
     /**
      * 车型信息
      *
-     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 5;</code>
-     * @return \Proto\Api\CarModelEnt|null
+     * Generated from protobuf field <code>.proto.api.EntTag car_tag_info = 5;</code>
+     * @return \Proto\Api\EntTag|null
      */
-    public function getCarModelInfo()
+    public function getCarTagInfo()
     {
-        return $this->car_model_info;
+        return $this->car_tag_info;
     }
 
-    public function hasCarModelInfo()
+    public function hasCarTagInfo()
     {
-        return isset($this->car_model_info);
+        return isset($this->car_tag_info);
     }
 
-    public function clearCarModelInfo()
+    public function clearCarTagInfo()
     {
-        unset($this->car_model_info);
+        unset($this->car_tag_info);
     }
 
     /**
      * 车型信息
      *
-     * Generated from protobuf field <code>.proto.api.CarModelEnt car_model_info = 5;</code>
-     * @param \Proto\Api\CarModelEnt $var
+     * Generated from protobuf field <code>.proto.api.EntTag car_tag_info = 5;</code>
+     * @param \Proto\Api\EntTag $var
      * @return $this
      */
-    public function setCarModelInfo($var)
+    public function setCarTagInfo($var)
     {
-        GPBUtil::checkMessage($var, \Proto\Api\CarModelEnt::class);
-        $this->car_model_info = $var;
+        GPBUtil::checkMessage($var, \Proto\Api\EntTag::class);
+        $this->car_tag_info = $var;
 
         return $this;
     }

gen/php/Proto/Api/EntTag.php

@@ -17,9 +17,9 @@ class EntTag extends \Google\Protobuf\Internal\Message
     /**
      * 标签名称
      *
-     * Generated from protobuf field <code>string name = 1;</code>
+     * Generated from protobuf field <code>string tag_name = 1;</code>
      */
-    protected $name = '';
+    protected $tag_name = '';
     /**
      * 标签code
      *
@@ -32,6 +32,12 @@ class EntTag extends \Google\Protobuf\Internal\Message
      * Generated from protobuf field <code>.proto.api.DEVICE_USE_TYPE tag_type = 3;</code>
      */
     protected $tag_type = 0;
+    /**
+     * tag的图片
+     *
+     * Generated from protobuf field <code>repeated string tag_images = 4;</code>
+     */
+    private $tag_images;
 
     /**
      * Constructor.
@@ -39,12 +45,14 @@ class EntTag extends \Google\Protobuf\Internal\Message
      * @param array $data {
      *     Optional. Data for populating the Message object.
      *
-     *     @type string $name
+     *     @type string $tag_name
      *           标签名称
      *     @type string $tag_code
      *           标签code
      *     @type int $tag_type
      *           标签类型
+     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $tag_images
+     *           tag的图片
      * }
      */
     public function __construct($data = NULL) {
@@ -55,25 +63,25 @@ class EntTag extends \Google\Protobuf\Internal\Message
     /**
      * 标签名称
      *
-     * Generated from protobuf field <code>string name = 1;</code>
+     * Generated from protobuf field <code>string tag_name = 1;</code>
      * @return string
      */
-    public function getName()
+    public function getTagName()
     {
-        return $this->name;
+        return $this->tag_name;
     }
 
     /**
      * 标签名称
      *
-     * Generated from protobuf field <code>string name = 1;</code>
+     * Generated from protobuf field <code>string tag_name = 1;</code>
      * @param string $var
      * @return $this
      */
-    public function setName($var)
+    public function setTagName($var)
     {
         GPBUtil::checkString($var, True);
-        $this->name = $var;
+        $this->tag_name = $var;
 
         return $this;
     }
@@ -130,5 +138,31 @@ class EntTag extends \Google\Protobuf\Internal\Message
         return $this;
     }
 
+    /**
+     * tag的图片
+     *
+     * Generated from protobuf field <code>repeated string tag_images = 4;</code>
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getTagImages()
+    {
+        return $this->tag_images;
+    }
+
+    /**
+     * tag的图片
+     *
+     * Generated from protobuf field <code>repeated string tag_images = 4;</code>
+     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
+     * @return $this
+     */
+    public function setTagImages($var)
+    {
+        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
+        $this->tag_images = $arr;
+
+        return $this;
+    }
+
 }
 

gen/swagger/api/CityPackage.swagger.json

@@ -879,9 +879,33 @@
     "apiAreaLevelEnt": {
       "type": "object",
       "properties": {
-        "area_info": {
-          "$ref": "#/definitions/apiAreaEnt",
-          "title": "区域信息"
+        "province_code": {
+          "type": "string",
+          "title": "区域信息\n省编号"
+        },
+        "province_name": {
+          "type": "string",
+          "title": "省名称"
+        },
+        "city_code": {
+          "type": "string",
+          "title": "市编号"
+        },
+        "city_name": {
+          "type": "string",
+          "title": "市名称"
+        },
+        "area_code": {
+          "type": "string",
+          "title": "区编号"
+        },
+        "area_name": {
+          "type": "string",
+          "title": "区名称"
+        },
+        "area_id": {
+          "type": "string",
+          "title": "地区code"
         },
         "children": {
           "type": "array",
@@ -1063,8 +1087,8 @@
           "$ref": "#/definitions/apiEntTag",
           "title": "电池标签信息"
         },
-        "car_model_info": {
-          "$ref": "#/definitions/apiCarModelEnt",
+        "car_tag_info": {
+          "$ref": "#/definitions/apiEntTag",
           "title": "车型信息"
         },
         "shop_info": {
@@ -1285,7 +1309,7 @@
     "apiEntTag": {
       "type": "object",
       "properties": {
-        "name": {
+        "tag_name": {
           "type": "string",
           "title": "标签名称"
         },
@@ -1296,6 +1320,13 @@
         "tag_type": {
           "$ref": "#/definitions/apiDEVICE_USE_TYPE",
           "title": "标签类型"
+        },
+        "tag_images": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "title": "tag的图片"
         }
       }
     },

gen/swagger/api/CityPackageMicroSoft.swagger.json

@@ -252,34 +252,6 @@
         }
       }
     },
-    "apiCarModelEnt": {
-      "type": "object",
-      "properties": {
-        "model_name": {
-          "type": "string",
-          "title": "车型名称"
-        },
-        "model_code": {
-          "type": "string",
-          "title": "车型编号"
-        },
-        "model_images": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "title": "车型图片"
-        },
-        "model_id": {
-          "type": "string",
-          "title": "车型ID"
-        },
-        "data_time": {
-          "$ref": "#/definitions/apiDataTime",
-          "title": "数据时间"
-        }
-      }
-    },
     "apiCityPackageEnt": {
       "type": "object",
       "properties": {
@@ -303,8 +275,8 @@
           "$ref": "#/definitions/apiEntTag",
           "title": "电池标签信息"
         },
-        "car_model_info": {
-          "$ref": "#/definitions/apiCarModelEnt",
+        "car_tag_info": {
+          "$ref": "#/definitions/apiEntTag",
           "title": "车型信息"
         },
         "shop_info": {
@@ -348,27 +320,6 @@
       "description": "- DEVICE_USE_TYPE_RESERVED: 保留\n - DEVICE_USE_TYPE_BATTERY: 租电/电池\n - DEVICE_USE_TYPE_ELECTRIC_VEHICLE: 租车/车辆\n - DEVICE_USE_TYPE_ELECTRIC_VEHICLE_BATTERY: 车电一体/车电一体",
       "title": "设备用途类型 | 对象使用类型"
     },
-    "apiDataTime": {
-      "type": "object",
-      "properties": {
-        "ctime": {
-          "type": "integer",
-          "format": "int32",
-          "title": "创建时间 时间戳 秒"
-        },
-        "utime": {
-          "type": "integer",
-          "format": "int32",
-          "title": "更新时间 时间戳 秒"
-        },
-        "dtime": {
-          "type": "integer",
-          "format": "int32",
-          "title": "删除时间 时间戳 秒"
-        }
-      },
-      "title": "数据的创建时间、更新时间、删除时间"
-    },
     "apiDetailPackageMicroSoftReq": {
       "type": "object",
       "properties": {
@@ -517,7 +468,7 @@
     "apiEntTag": {
       "type": "object",
       "properties": {
-        "name": {
+        "tag_name": {
           "type": "string",
           "title": "标签名称"
         },
@@ -528,6 +479,13 @@
         "tag_type": {
           "$ref": "#/definitions/apiDEVICE_USE_TYPE",
           "title": "标签类型"
+        },
+        "tag_images": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "title": "tag的图片"
         }
       }
     },