From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-ui/src/views/system/user/profile/resetPwd.vue | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
index 86073d3..ee65240 100644
--- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
+++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@@ -18,7 +18,6 @@
<script>
import { updateUserPwd } from "@/api/system/user";
-import Global from "@/layout/components/global.js";
export default {
data() {
@@ -65,7 +64,6 @@
});
},
close() {
- Global.$emit("removeCache", "closeSelectedTag", this.$route);
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/index" });
}
--
Gitblit v1.9.3