Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/dao/user/UserExchangeDao.php

@@ -88,7 +88,7 @@ class UserExchangeDao extends BaseDao
     {
         return $this->search($where)->field($field)->with([
             'user' => function ($query) {
-                $query->field('uid,nickname');
+                $query->field('uid,nickname,real_name,card_id,phone');
             }])->page($page, $limit)->order('id desc')->select()->toArray();
     }
 

app/services/user/UserExchangeServices.php

@@ -96,6 +96,8 @@ class UserExchangeServices extends BaseServices
         $list = $this->dao->getExtractList($where, $field, $page, $limit);
         foreach ($list as &$item) {
             $item['nickname'] = $item['user']['nickname'] ?? '';
+            $item['real_name'] = $item['user']['real_name'] ?? '';
+            $item['card_id'] = $item['user']['card_id'] ?? '';
         }
         $count = $this->dao->count($where);
         return compact('list', 'count');