Merge pull request '最近登入ip' (#4) from feature/oa1215 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/4

Application/Sdk/Controller/FengHuoApi2Controller.class.php

@@ -244,7 +244,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
 //        $where['login_time'] = array('neq',0);
 
         $data = M('user_login_record','tab_')
-            ->field('tab_user_login_record.id,tab_user_login_record.id,user_id,game_name,server_name,login_time,user_account,game_player_name,CASE WHEN promote_id = 0 THEN "官方渠道" ELSE account END as promote_account')
+            ->field('tab_user_login_record.id,tab_user_login_record.login_ip,user_id,game_name,server_name,login_time,user_account,game_player_name,CASE WHEN promote_id = 0 THEN "官方渠道" ELSE account END as promote_account')
             ->join("left join tab_promote as promote on tab_user_login_record.promote_id=promote.id")
             ->where($where)
             ->order($order)