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

疯狂的狮子li

2021-11-17 81d04fb31f234409229b9e96b5329020cd499f25

 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(() => {});
    }