Merge branch 'dev' of https://git.23cm.cn/toom1996/frontend_v2 into dev

update
2026-10-20 23:13:35 +08:00 · 2026-10-20 23:13:08 +08:00
1 changed files with 5 additions and 0 deletions
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@ -1,5 +1,10 @@
 name: deploy
 on:
+<<<<<<< HEAD
+  # 手动触发：在 Gitea 仓库 Actions 页面点「Run workflow」才部署，
+  # 避免每次 push 到 main 的半成品代码被自动上线。
+=======
+>>>>>>> 29c2d77a8585ff20a7ed193cd45a7a291c63befe
  workflow_dispatch:

 jobs:
Author	SHA1	Message	Date
toom1996	f582d8d071	Merge branch 'dev' of https://git.23cm.cn/toom1996/frontend_v2 into dev	2026-10-20 23:13:35 +08:00
toom1996	ab5305aef9	update	2026-10-20 23:13:08 +08:00