fix: 解决Git合并冲突

- 解决ApiKeysView.vue中的合并冲突
- 解决CreateApiKeyModal.vue中的合并冲突
- 解决EditApiKeyModal.vue中的合并冲突
- 保留本地修改版本，包含更完善的功能：
  - Claude OAuth和Console账户分组显示
  - 移动端响应式优化
  - 批量创建API Key功能

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

web/admin-spa/src/views/ApiKeysView.vue

@@ -12,45 +12,11 @@
         </div>
         <div class="flex flex-col sm:flex-row gap-3 sm:items-center sm:justify-between">
           <!-- Token统计时间范围选择 -->
-<<<<<<< Updated upstream
-          <select 
-            v-model="apiKeyStatsTimeRange" 
-            class="px-2 py-1 text-sm text-gray-700 bg-white border border-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent hover:border-gray-300 transition-colors"
-            @change="loadApiKeys()"
-          >
-            <option value="today">
-              今日
-            </option>
-            <option value="7days">
-              最近7天
-            </option>
-            <option value="monthly">
-              本月
-            </option>
-            <option value="all">
-              全部时间
-            </option>
-          </select>
-          <!-- 标签筛选器 -->
-          <select 
-            v-model="selectedTagFilter" 
-            class="px-2 py-1 text-sm text-gray-700 bg-white border border-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent hover:border-gray-300 transition-colors"
-            @change="currentPage = 1"
-          >
-            <option value="">
-              所有标签
-            </option>
-            <option
-              v-for="tag in availableTags"
-              :key="tag"
-              :value="tag"
-=======
           <div class="flex flex-wrap gap-2 items-center">
             <select 
               v-model="apiKeyStatsTimeRange" 
               class="px-3 py-2 text-sm text-gray-700 bg-white border border-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent hover:border-gray-300 transition-colors"
               @change="loadApiKeys()"
->>>>>>> Stashed changes
             >
               <option value="today">
                 今日
@@ -84,11 +50,7 @@
             </select>
           </div>
           <button 
-<<<<<<< Updated upstream
-            class="btn btn-primary px-6 py-3 flex items-center gap-2"
-=======
             class="btn btn-primary px-4 py-2 text-sm flex items-center gap-2 w-full sm:w-auto justify-center"
->>>>>>> Stashed changes
             @click.stop="openCreateApiKeyModal"
           >
             <i class="fas fa-plus" />创建新 Key
@@ -646,8 +608,6 @@
           </tbody>
         </table>
       </div>
-<<<<<<< Updated upstream
-=======
       
       <!-- 移动端卡片视图 -->
       <div
@@ -946,7 +906,6 @@
           </button>
         </div>
       </div>
->>>>>>> Stashed changes
     </div>
     
     <!-- 模态框组件 -->