添加城市和对应的活动类型

@@ -474,7 +474,7 @@ class IndexController extends RestBaseController
      *
      * @header name:XX-Token require:1 default: desc:token
      *
-     * @param name:type_id type:int require:1 other: desc:类型id
+     * @param name:type n_id type:int require:1 other: desc:类型id
      * @return activity:活动@
      * @activity id:id activity_name:活动名称 abstract:摘要 thumbnail:缩略图 time:时间 content:内容 province_name:省市地区
 

@@ -58,6 +58,7 @@ class JoinModel extends Model
           $info=$this->alias('j')
               ->join('cmf_activity a','a.id=j.activity_id')
               ->join('cmf_activity_type at','a.activity_type=at.id')
+              ->join('cmf_position_province pp','a.position_id=pp.id')
               ->where($where)
               ->select()
               ->toArray();