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

jiangping

2024-06-26 2b773dd14058d4eeacb38b0813edecc86170fd0c

 company/src/components/common/CommonHeader.vue

@@ -101,6 +101,11 @@
      if (userInfo == null) {
        return ''
      }
      if (userInfo.type === 1 && userInfo.company != null && userInfo.company.name.trim().length > 0) {
        if (userInfo.company.username === userInfo.username){
          return userInfo.company.name
        }
      }
      if (userInfo.realname != null && userInfo.realname.trim().length > 0) {
        return userInfo.realname
      }