From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/components/OperaRoomsWindow.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index cbb22d9..a3aa091 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -42,8 +42,7 @@
v-for="item in userList()"
:key="item.id"
:value="item.id"
-
- :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+ :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
/>
</el-select>
</el-form-item>
@@ -101,7 +100,7 @@
id: null,
sysList: [],
projectList: [],
- createDate: null,
+ createDate: '',
editor: '',
editDate: null,
isdeleted: 0,
--
Gitblit v1.9.3