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

---
 applications/drone-command/src/views/permissionManage/permissionUser.vue |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/applications/drone-command/src/views/permissionManage/permissionUser.vue b/applications/drone-command/src/views/permissionManage/permissionUser.vue
index beb1f95..005d17d 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser.vue
@@ -1,9 +1,7 @@
 <template>
-  <basic-container>
-    用户管理
-  </basic-container>
+	<PermissionUser />
 </template>
+
 <script setup>
+import PermissionUser from './permissionUser/index.vue'
 </script>
-<style scoped lang="scss">
-</style>

--
Gitblit v1.9.3