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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

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