Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-02 cfdeada3fdb415ea451fb3fb76b96a2e7977752c

 ruoyi-ui/src/utils/request.js

@@ -64,7 +64,7 @@
          location.href = '/index';
        })
      }).catch(() => {});
      return Promise.reject('error')
      return Promise.reject()
    } else if (code === 500) {
      Message({
        message: msg,