From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突
---
admin/src/components/common/CommonHeader.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index d1eff86..92adf7f 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -114,9 +114,9 @@
},
mounted() {
// needChangePwd 0 : 榛樿瀵嗙爜闇�瑕佷慨鏀癸紝1 涓嶉渶瑕�
- if (this.userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
- this.visible.changePwd = true
- }
+ // if (this.userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
+ // this.visible.changePwd = true
+ // }
},
filters: {
// 灞曠ず鍚嶇О
--
Gitblit v1.9.3