Merge remote-tracking branch 'origin/master'

src/layout/components/Navbar.vue

@@ -10,7 +10,7 @@
 
         <div class="inv-hos-title">
           <span style="margin: 14px;color: #2d8cf0;font-size: 14px;">部门&nbsp:&nbsp{{ deptName }}&nbsp </span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">  &nbsp用户&nbsp:&nbsp吴XX{{ this.companyName }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">  &nbsp用户&nbsp:&nbsp{{ this.companyName }}</span>
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{this.userName }})</span>
         </div>
         <search id="header-search" class="right-menu-item"/>
@@ -411,6 +411,7 @@ export default {
   },
   created() {
     this.userName = this.$store.getters.name;
+    this.companyName = this.$store.getters.companyName;
       this.userInfo = {
         id: store.getters.adminId,
         locInvCode: store.getters.locInvCode,