Merge branch 'dev'

Application/Sdk/Controller/FengHuoApi2Controller.class.php

@@ -76,7 +76,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
 //        默认排序：id降序
         $order = 'register_time asc';
         $data = M('user','tab_')
-            ->field('id,account,promote_account,register_ip,register_time,device_type,device_number','fgame_name')
+            ->field('id,account,promote_account,register_ip,register_time,device_type,device_number,fgame_name')
             ->where($where)
             ->order($order)
             ->page($page, $row)
@@ -97,6 +97,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
                     }
                 }
             }
+            unset($data[$k]['fgame_name']);
 
         }
 

Application/Sdk/Controller/FengHuoApiController.class.php

@@ -76,7 +76,7 @@ class FengHuoApiController extends Controller{
 //        默认排序：id降序
         $order = 'register_time asc';
         $data = M('user','tab_')
-            ->field('id,account,promote_account,register_ip,register_time,device_type,device_number','fgame_name')
+            ->field('id,account,promote_account,register_ip,register_time,device_type,device_number,fgame_name')
             ->where($where)
             ->order($order)
             ->page($page, $row)
@@ -97,6 +97,7 @@ class FengHuoApiController extends Controller{
                     }
                 }
             }
+            unset($data[$k]['fgame_name']);
 
         }