From 653120dde7588e5be464166d3c316dc80227dbb0 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 01 九月 2025 16:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_ZQHX' into dev
---
src/views/collaborativeApproval/meetingBoard/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/collaborativeApproval/meetingBoard/index.vue b/src/views/collaborativeApproval/meetingBoard/index.vue
index f60287a..b6b803b 100644
--- a/src/views/collaborativeApproval/meetingBoard/index.vue
+++ b/src/views/collaborativeApproval/meetingBoard/index.vue
@@ -164,8 +164,8 @@
startTime: '2025-01-15 09:00:00',
endTime: '2025-01-15 10:30:00',
location: '浼氳瀹',
- host: '寮犵粡鐞�',
- participants: ['寮犵粡鐞�', '鏉庡伐绋嬪笀', '鐜嬭璁″笀', '璧垫祴璇曞憳'],
+ host: '闄堝織寮�',
+ participants: ['闄堝織寮�', '鍒橀泤濠�', '鐜嬪缓鍥�', '璧典附鍗�'],
agenda: [
{ time: '09:00-09:15', content: '涓婂懆宸ヤ綔鎬荤粨', status: 'completed' },
{ time: '09:15-09:45', content: '鏈懆寮�鍙戣鍒�', status: 'active' },
@@ -180,8 +180,8 @@
startTime: '2025-01-15 14:00:00',
endTime: '2025-01-15 15:00:00',
location: '绾夸笂浼氳',
- host: '闄堟�荤洃',
- participants: ['闄堟�荤洃', '鍒樹骇鍝佺粡鐞�', '瀛欏鎴风粡鐞�', '瀹㈡埛浠ｈ〃'],
+ host: '闄堝織寮�',
+ participants: ['闄堝織寮�', '鍒橀泤濠�', '瀛欐槑鍗�', '瀹㈡埛浠ｈ〃'],
agenda: [
{ time: '14:00-14:20', content: '闇�姹傝儗鏅粙缁�', status: 'pending' },
{ time: '14:20-14:40', content: '鍔熻兘闇�姹傚垎鏋�', status: 'pending' },
--
Gitblit v1.9.3