Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/admin/model/user/User.php

@@ -1200,9 +1200,9 @@ class User extends BaseModel
         $list = self::where('spread_uid', $uid)->field('uid,nickname,now_money,integral,add_time')
             ->order('uid desc')->page((int)$page, (int)$limit)->select();
         count($list) && $list = $list->toArray();
-        foreach ($list as &$item) {
-            $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
-        }
+//        foreach ($list as &$item) {
+//            $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
+//        }
         return $list;
     }