Merge remote-tracking branch 'origin/master'

src/main/java/com/lovenav/controller/UserController.java

@@ -139,6 +139,7 @@ public class UserController {
                 result.put("roleId",user1.getRoleId());
                 result.put("userRegistered",user1.getUserRegistered());
                 result.put("token",token);
+                result.put("avatar",user1.getAvatar());
             }else {
                 result.put("msg","用户名或密码错误!");
             }