...

src/design-system/base/button/button.tsx

@@ -4,7 +4,7 @@ import React from "react";
 import Link from "next/link";
 import Image from "next/image";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Button 组件

src/design-system/base/card/card.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Card 卡片组件

src/design-system/base/checkbox/checkbox.tsx

@@ -2,7 +2,7 @@
 
 import React, { forwardRef } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Checkbox 复选框组件

src/design-system/base/input/input.tsx

@@ -2,7 +2,7 @@
 
 import React, { forwardRef } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Input 输入框组件

src/design-system/base/radio/radio.tsx

@@ -2,7 +2,7 @@
 
 import React, { forwardRef } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Radio 单选按钮组件

src/design-system/base/select/select.tsx

@@ -2,7 +2,7 @@
 
 import React, { forwardRef } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Select 下拉选择框组件

src/design-system/base/switch/switch.tsx

@@ -2,7 +2,7 @@
 
 import React, { forwardRef, useState } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Switch 开关组件

src/design-system/base/textarea/textarea.tsx

@@ -2,7 +2,7 @@
 
 import React, { forwardRef } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Textarea 多行文本输入组件

src/design-system/data-display/badge/badge.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Badge 徽章组件

src/design-system/data-display/divider/divider.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Divider 分隔线组件

src/design-system/feedback/alert/alert.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Alert 警告提示组件

src/design-system/feedback/progress/progress.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Progress 进度条组件

src/design-system/feedback/skeleton/skeleton.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Skeleton 骨架屏组件

src/design-system/layout/container/container.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Container 容器组件

src/design-system/layout/grid/grid.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import React from "react";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Grid 网格布局组件

src/design-system/layout/stack/stack.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Stack 堆叠布局组件

src/design-system/lib/utils.ts

@@ -1,23 +0,0 @@
-import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
-
-/**
- * 合并 Tailwind CSS 类名的工具函数
- *
- * 使用 clsx 处理条件类名，然后使用 tailwind-merge 解决 Tailwind 类名冲突
- *
- * @param inputs - 类名（字符串、对象、数组等）
- * @returns 合并后的类名字符串
- *
- * @example
- * ```tsx
- * cn('px-4 py-2', isActive && 'bg-primary-500', 'text-white')
- * // => 'px-4 py-2 bg-primary-500 text-white'
- *
- * cn('px-4 px-6')  // 自动解决冲突
- * // => 'px-6'
- * ```
- */
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}

src/design-system/navigation/tabs/tabs.tsx

@@ -2,7 +2,7 @@
 
 import React, { useState } from "react";
 import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Tabs 标签页组件

src/design-system/overlay/modal/modal.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import React, { useEffect } from "react";
-import { cn } from "@/design-system/lib/utils";
+import { cn } from "@/utils/cn";
 
 /**
  * Modal 模态框组件