From bb8601a2b5fa27ea86206893b073b47817158994 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 09 Jan 2026 15:46:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/applications/drone-command/src/views/basicManage/deviceScrap.vue b/applications/drone-command/src/views/basicManage/deviceScrap/deviceScrap.vue
similarity index 100%
rename from applications/drone-command/src/views/basicManage/deviceScrap.vue
rename to applications/drone-command/src/views/basicManage/deviceScrap/deviceScrap.vue

--
Gitblit v1.9.3