From 39ec001f02bde6fd7b7a40bdf7b2313df87e8e76 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 17 Jan 2026 17:34:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue b/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
index 2310b82..1d5d632 100644
--- a/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
@@ -24,7 +24,7 @@
 				</div>
 				<div class="col">
 					<span class="label">厂商</span>
-					{{ data.vendor }}
+					{{ data.manufacturer }}
 				</div>
 			</div>
 			<div class="row">

--
Gitblit v1.9.3