合并分支 'heshupeng' 到 'master'

Heshupeng



查看合并请求 !190

@@ -735,10 +735,13 @@ class User extends Api
         $where = ['user_id'=>$this->auth->id];
         $where = ['user_id'=>$this->auth->id];
         $total_num = UserMoneyLog::where($where)->count();
         $total_num = UserMoneyLog::where($where)->count();
         $list = UserMoneyLog::where($where)
         $list = UserMoneyLog::where($where)
-        	->field("memo,money,before,after,status,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
+        	->field("memo,money,before,after,status,createtime")
             ->page($page,$pageNum)
             ->page($page,$pageNum)
             ->order('createtime','DESC')
             ->order('createtime','DESC')
         	->select();
         	->select();
+        foreach ($list as &$v) {
+            $v['createtime'] = date('Y-m-d H:i:s',$v['createtime']);
+        }
         $this->success('成功',compact('total_num','list'));
         $this->success('成功',compact('total_num','list'));
     }
     }