Merge branch 'develop'

database/migrations/2019_04_23_071015_create_table_config_province.php

@@ -19,8 +19,7 @@ class CreateTableConfigProvince extends Migration
             $table->integer('parent_id');//父级ID
             $table->integer('level');//级别
             $table->tinyInteger('sort');//排序
-            $table->string('area_code',50)->nullable()->comment('地区编码');
-            $table->string('city_code',50)->comment('城市编码');
+            $table->string('area_code',6)->nullable()->comment('地区编码');
             $table->string('center',50)->comment('城市中心点（即：经纬度坐标）');
             $table->integer('bjcity_id')->nullable()->comment('百度cityid');
             $table->timestamps();