From 93e0df5064c4ce9201aae751fc5d1a2994b2353e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 13 Jan 2026 16:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/areaManage/sceneConfig/index.vue |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
index a58a5a7..92be17e 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
@@ -41,7 +41,6 @@
 		<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" />
 			<el-table-column type="index" width="60" label="序号" />
-			<el-table-column prop="deviceName" label="设备名称" />
 			<el-table-column prop="sceneName" label="场景名称" />
 			<el-table-column prop="sceneType" label="场景类型">
 				<template v-slot="{ row }">

--
Gitblit v1.9.3