fix: 清除合并后残留的冲突标记

router/index.js 和 app-user/index.vue 中的嵌套冲突标记
已清除，前端构建验证通过

code/frontend/src/router/index.js

@@ -120,8 +120,8 @@ const routes = [
       }
     ]
   }
-    ]
-  },
+]
+},
   {
     path: '/404',
     name: '404',

code/frontend/src/views/user/app-user/index.vue

@@ -10,14 +10,14 @@
           <el-input v-model="queryForm.nickname" placeholder="请输入昵称" clearable style="width:180px" />
         </el-form-item>
         <el-form-item label="用户类型">
-          <el-select v-model="queryForm.userType" placeholder="全部" clearable style="width:120px">
+<el-select v-model="queryForm.userType" placeholder="全部" clearable style="width:120px">
                 <el-option
                   v-for="item in userCategoryOptions"
                   :key="item.code"
                   :label="item.name"
                   :value="item.code"
                 />
-          </el-select>
+              </el-select>
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="queryForm.status" placeholder="全部" clearable style="width:100px">
@@ -46,13 +46,13 @@
         <el-table-column prop="phone" label="手机号" width="130" />
         <el-table-column prop="nickname" label="昵称" />
         <el-table-column prop="userType" label="用户类型" width="100" align="center">
-          <template #default="{ row }">
-                <el-tag
-                  :type="userTypeTagType(row.userType)"
-                  size="small"
-                >
-                  {{ userTypeText(row.userType) }}
-            </el-tag>
+<template #default="{ row }">
+              <el-tag
+                :type="userTypeTagType(row.userType)"
+                size="small"
+              >
+                {{ userTypeText(row.userType) }}
+              </el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="状态" width="80" align="center">
@@ -110,14 +110,14 @@
           <el-input v-model="formData.nickname" placeholder="请输入昵称" />
         </el-form-item>
         <el-form-item label="用户类型" prop="userType">
-          <el-select v-model="formData.userType" placeholder="请选择" style="width:100%">
-                <el-option
-                  v-for="item in userCategoryOptions"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-          </el-select>
+<el-select v-model="formData.userType" placeholder="请选择" style="width:100%">
+                  <el-option
+                    v-for="item in userCategoryOptions"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                  />
+                </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="formData.status">