省市区merge_name

app/api/logic/RegionLogic.php

@@ -22,7 +22,7 @@ class RegionLogic extends BaseLogic
      */
     public static function getRegionList()
     {
-        $area_list = PostageRegion::cache(true,86400)->where('first','<>','')->field('id,name,pid')->order('sorts asc,id asc')->select()->toArray();
+        $area_list = PostageRegion::cache(true,86400)->where('first','<>','')->field('id,name,merge_name,pid')->order('sorts asc,id asc')->select()->toArray();
         foreach ($area_list as &$vo) {
             $vo['field'] = self::get_first_char($vo['name']);
         }