Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into baidu-m

app/api/lists/property/PropertyGroupOrderLists.php

@@ -62,7 +62,8 @@ class PropertyGroupOrderLists extends BaseApiDataLists implements ListsSearchInt
         $lists = GroupUserOrder::alias('a')
             ->leftJoin('group_order b','a.group_order_id=b.id')
             ->leftJoin('group_service_work c','a.id=c.group_user_order_id')
-            ->field('a.id,a.status,a.order_amount,a.mobile,a.area,a.address,a.create_time,a.num,c.service_status')
+            ->leftJoin('group_activity d','a.group_activity_id=d.id')
+            ->field('a.id,a.status,a.order_amount,a.mobile,a.area,a.address,a.create_time,a.group_activity_id,a.num,c.service_status,d.title')
             ->where($this->queryWhere())
             ->limit($this->limitOffset, $this->limitLength)
             ->order('a.create_time', 'desc')