Merge remote-tracking branch 'upstream/master'

fungleo

2020-08-04 107672419e484d7893ecf624d4af2101cc72d890

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

@@ -94,7 +94,7 @@
        type: 'warning'

      }).then(() => {

        this.$store.dispatch('LogOut').then(() => {

          location.reload()

          location.href = '/index';

        })

      })

    }