feat: 合并主分支后端代码

2026-09-03 13:16:08 +08:00
parent df40ddde8c 037928c778
commit 35fcf8776e
52 changed files with 8215 additions and 4396 deletions
@@ -5,8 +5,21 @@
    justify-content: center;
    padding: 24px;
    background:
+<<<<<<< HEAD
        radial-gradient(1000px 500px at 15% -10%, rgba(139, 92, 246, 0.14), transparent 60%),
        radial-gradient(900px 480px at 95% 110%, rgba(109, 40, 217, 0.1), transparent 55%),
+=======
+        radial-gradient(
+            1000px 500px at 15% -10%,
+            rgba(139, 92, 246, 0.14),
+            transparent 60%
+        ),
+        radial-gradient(
+            900px 480px at 95% 110%,
+            rgba(109, 40, 217, 0.1),
+            transparent 55%
+        ),
+>>>>>>> feat-0.2.0
        var(--bg-color);
 }