Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue

RuoYi

2020-07-04 31765f63926c31d6a7322df5d19e30c04ba2839e

 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 => {