From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/layouts/AppLayout.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/company/src/layouts/AppLayout.vue b/company/src/layouts/AppLayout.vue
index 96b84b5..ab907f4 100644
--- a/company/src/layouts/AppLayout.vue
+++ b/company/src/layouts/AppLayout.vue
@@ -47,7 +47,8 @@
// 浼佷笟绔敤鎴疯缃按鍗�
if (this.userInfo.type === 1 || this.userInfo.type === 2) {
if(this.userInfo.company && this.userInfo.company.name){
- Watermark.set(this.userInfo.company.name, this.$refs.containerS);
+ Watermark.set(this.userInfo.showCompany.name, this.$refs.containerS);
+ // Watermark.set(this.userInfo.company.name, this.$refs.containerS);
}
}
},
--
Gitblit v1.9.3