Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c6c0665f61
@ -139,6 +139,7 @@ public class UserController {
|
|||||||
result.put("roleId",user1.getRoleId());
|
result.put("roleId",user1.getRoleId());
|
||||||
result.put("userRegistered",user1.getUserRegistered());
|
result.put("userRegistered",user1.getUserRegistered());
|
||||||
result.put("token",token);
|
result.put("token",token);
|
||||||
|
result.put("avatar",user1.getAvatar());
|
||||||
}else {
|
}else {
|
||||||
result.put("msg","用户名或密码错误!");
|
result.put("msg","用户名或密码错误!");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user