Merge remote-tracking branch 'origin/wyc624' into wyc624

# Conflicts:
#	src/main/java/com/zhentao/user/service/impl/UserLoginServiceImpl.java

src/main/java/com/zhentao/user/service/impl/UserLoginServiceImpl.java

@@ -230,7 +230,10 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper, UserLogin
                 Map<String,Object> map = new HashMap<>();
                 map.put("token",jwtToken);
                 map.put("userId",one.getId()+"");
-                map.put("image",one.getAvatar()+"");
+<<<<<<<<< Temporary merge branch 1
+                map.put("image",one.getUserName()+"");
+=========
+>>>>>>>>> Temporary merge branch 2
                 //用户上线
                 onlineStatusService.userGoOnline(one.getId());