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

src/layout/components/Navbar.vue

@@ -13,7 +13,7 @@
               style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门&nbsp:&nbsp{{ deptName }}</span>
           <span
             style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库&nbsp:&nbsp{{ inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp吴XX{{ this.companyName }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ this.companyName }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
               this.userName
@@ -434,6 +434,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,