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

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

 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" });
    }