Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Mobile/Controller/UserController.class.php

@@ -1419,8 +1419,10 @@ class UserController extends BaseController
             $this->redirect('Mobile/User/login');
         }
         $map['user_id'] = $this->suser->login_info('user_id');
-        $data = D('DownRecord')->table('tab_down_record AS tdr')
-            ->field('tab_game.id,tab_game.dow_status,tab_game.game_name,tab_game.game_size,tab_game.dow_num,tab_game.icon,tab_game.features,tdr.user_id,tab_game.and_dow_address,tab_game.add_game_address,tab_game.ios_dow_address,tab_game.ios_game_address,tab_game.game_score,tab_game.sdk_version')
+        $data = D('DownRecord')->table('tab_user_game_login_record AS tdr')
+            ->field('tab_game.id,tab_game.dow_status,tab_game.game_name,tab_game.game_size,tab_game.dow_num,
+            tab_game.icon,tab_game.features,tdr.user_id,tab_game.and_dow_address,tab_game.add_game_address,
+            tab_game.ios_dow_address,tab_game.ios_game_address,tab_game.game_score,tab_game.sdk_version')
             ->join("tab_game ON tdr.game_id = tab_game.id")
             ->where($map)
             ->select();