Merge branch 'dev_zyx' into dev

Application/Admin/Controller/ExportController.class.php

@@ -5471,7 +5471,6 @@ if ($key == 'model'){
             array('pay_order_number','支付订单号'),
             array('pay_time','充值时间'),
             array('user_account','玩家账号'),
-            array('user_nickname','玩家昵称'),
             array('game_name','游戏名称'),
             array('promote_account','所属推广员'),
             array('spend_ip','充值ip'),
@@ -5526,7 +5525,7 @@ if ($key == 'model'){
             $map['user_nickname'] = array('like',I("user_nickname").'%');
         }
 
-        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
         $group = "";
         $order = "pay_time DESC";
         $xlsData = D('spend')->getSpendData($map,$field,$group,$order);