Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-11-29 bf98ee3c936130bf4df4b2eda1240f61cf380ac3

 ruoyi-ui/src/layout/components/Navbar.vue

@@ -102,7 +102,7 @@
        type: 'warning'
      }).then(() => {
        this.$store.dispatch('LogOut').then(() => {
          location.href = process.env.VUE_APP_CONTEXT_PATH;
          location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
        })
      }).catch(() => {});
    }