From 09300a153d46b921ec80df0e0d9448f36ab8edf6 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 16 Jan 2026 10:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/recordManage/alarmRecords/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
index 7cf0dfd..6b73a64 100644
--- a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
+++ b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
@@ -36,7 +36,7 @@
 					/>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="时间">
+			<el-form-item label="告警时间">
 				<el-date-picker
 					popper-class="ztzf-data-cockpit-date-picker-popper"
 					class="ztzf-data-cockpit-date-picker"

--
Gitblit v1.9.3