Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-12 5413b37d71ddbaa42dc6f1ba7b885a322b9a3871

 ruoyi-ui/src/views/register.vue

@@ -127,7 +127,8 @@
          register(this.registerForm).then(res => {
            const username = this.registerForm.username;
            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
              dangerouslyUseHTMLString: true
              dangerouslyUseHTMLString: true,
              type: 'success'
            }).then(() => {
              this.$router.push("/login");
            }).catch(() => {});