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

k94314517

2024-04-12 02cb47bef10bafc3a591f160f0b286df529c704a

 company/src/layouts/AppLayout.vue

@@ -45,8 +45,10 @@

    mounted() {
      // 企业端用户设置水印
      if (this.userInfo.type === 1) {
      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);
        }
      }
    },