Skip to content

Commit

Permalink
#435
Browse files Browse the repository at this point in the history
  • Loading branch information
orvice committed Apr 3, 2016
1 parent 6fcb2bf commit e254cb7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/Controllers/Mu/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ class UserController extends BaseController
// User List
public function index($request, $response, $args)
{
$user = User::all();
$users = User::all();
$res = [
"ret" => 1,
"msg" => "ok",
"data" => $user
"data" => $users
];
return $this->echoJson($response, $res);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class User extends Model
"u" => 'int',
"d" => 'int',
"port" => 'int',
"transfer_enable" => 'int',
"transfer_enable" => 'float',
"enable" => 'int',
'is_admin' => 'boolean',
];
Expand Down

0 comments on commit e254cb7

Please sign in to comment.