Merge remote-tracking branch 'origin/master'

src/main/java/com/yipin/liuwanr/mapper/UserInfoMapper.java

@@ -129,7 +129,7 @@ public interface UserInfoMapper {
     UserInfo logins(UserInfo userInfo);
 
     //登陆
-    @Select("SELECT token,userId,userName,roleId from hr_user_info where isdel=0 and account = #{account} and password = #{password}")
+    @Select("SELECT token,userId,userName,roleId,userAvatars from hr_user_info where isdel=0 and account = #{account} and password = #{password}")
     UserInfo adminLogins(UserInfo userInfo);
 
     //登陆账号密码