Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-23 e2ed7cb4ef578d970beca80aea4903e9b13cd1f8

 src/store/modules/user.js

@@ -103,11 +103,12 @@
      })
    },
    //获取用户信息
    GetUserInfo({commit}) {
    GetUserInfo({commit}) {//获取用户信息liu++
      return new Promise((resolve, reject) => {
        getUserInfo().then((res) => {
          const data = res.data.data;
          commit('SET_ROLES', data.roles);
          console.log(data);
          resolve(data);
        }).catch(err => {
          reject(err);