Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus

疯狂的狮子li

2020-06-01 2e37fe9bc9999918cbd3d36905a96a7add8e7c51

 ruoyi-ui/src/store/modules/user.js

@@ -58,7 +58,7 @@
          } else {
            commit('SET_ROLES', ['ROLE_DEFAULT'])
          }
          commit('SET_NAME', user.username)
          commit('SET_NAME', user.userName)
          commit('SET_AVATAR', avatar)
          resolve(res)
        }).catch(error => {