From 931aebc875a4d927aae21a36250e2008616c02e4 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 01 九月 2025 16:19:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_erjitaocan' into dev
---
src/views/collaborativeApproval/meetingBoard/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/collaborativeApproval/meetingBoard/index.vue b/src/views/collaborativeApproval/meetingBoard/index.vue
index 63c74f9..f60287a 100644
--- a/src/views/collaborativeApproval/meetingBoard/index.vue
+++ b/src/views/collaborativeApproval/meetingBoard/index.vue
@@ -161,8 +161,8 @@
id: 1,
title: '浜у搧寮�鍙戝懆浼�',
status: 'ongoing',
- startTime: '2024-01-15 09:00:00',
- endTime: '2024-01-15 10:30:00',
+ startTime: '2025-01-15 09:00:00',
+ endTime: '2025-01-15 10:30:00',
location: '浼氳瀹',
host: '寮犵粡鐞�',
participants: ['寮犵粡鐞�', '鏉庡伐绋嬪笀', '鐜嬭璁″笀', '璧垫祴璇曞憳'],
@@ -177,8 +177,8 @@
id: 2,
title: '瀹㈡埛闇�姹傝瘎瀹′細',
status: 'upcoming',
- startTime: '2024-01-15 14:00:00',
- endTime: '2024-01-15 15:00:00',
+ startTime: '2025-01-15 14:00:00',
+ endTime: '2025-01-15 15:00:00',
location: '绾夸笂浼氳',
host: '闄堟�荤洃',
participants: ['闄堟�荤洃', '鍒樹骇鍝佺粡鐞�', '瀛欏鎴风粡鐞�', '瀹㈡埛浠ｈ〃'],
@@ -192,8 +192,8 @@
id: 3,
title: '鍥㈤槦寤鸿娲诲姩',
status: 'completed',
- startTime: '2024-01-14 16:00:00',
- endTime: '2024-01-14 18:00:00',
+ startTime: '2025-01-14 16:00:00',
+ endTime: '2025-01-14 18:00:00',
location: '鍏徃澶у巺',
host: '浜轰簨閮�',
participants: ['鍏ㄤ綋鍛樺伐'],
--
Gitblit v1.9.3