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

k94314517

2025-06-25 f6722e13ba28cd292c162df9292bb3418ba12bec

 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);
        }
      }
    },
@@ -66,7 +67,7 @@

  display: flex;
  // overflow: hidden;
  overflow: scroll;
  overflow: hidden;
  // 左边菜单
  .el-aside {
    width: $menu-width !important;