From 8292fc1fc7039f04eec225fefe7d1b837ee9aa25 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 27 Jan 2021 16:40:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
package.json | 2 +-
src/page/login/userlogin.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 9e894f1..af762c5 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"@vue/cli-plugin-eslint": "^3.1.5",
"@vue/cli-service": "^3.1.4",
"chai": "^4.1.2",
- "node-sass": "^4.12.0",
+ "node-sass": "^4.14.1",
"sass-loader": "^7.0.1",
"vue-template-compiler": "^2.5.17",
"webpack-bundle-analyzer": "^3.0.3"
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 9f369f9..33fd81c 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -76,7 +76,7 @@
tenantMode: this.website.tenantMode,
loginForm: {
//租户ID
- tenantId: "000000",
+ tenantId: "963841",
//用户名
username: "admin",
//密码
--
Gitblit v1.9.3