From dcf00a3d484cb8b7b2141d7b01a4f33689ed33da Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Fri, 1 Aug 2025 17:50:51 +0800
Subject: [PATCH] =?UTF-8?q?ci(auto-merge):=20=E6=B7=BB=E5=8A=A0=E5=B0=86ma?=
 =?UTF-8?q?in=E5=88=86=E6=94=AF=E8=87=AA=E5=8A=A8=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=88=B0base-tm-ui=E5=88=86=E6=94=AF=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/auto-merge.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index a73a021..339c0a2 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -97,6 +97,24 @@ jobs:
           git merge main --no-ff -m "Auto merge main into base-uview-plus"
           git push origin base-uview-plus
 
+  merge-to-base-tm-ui:
+    name: Merge main into base-tm-ui
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
+
+      - name: Merge main into base-tm-ui
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout base-tm-ui
+          git merge main --no-ff -m "Auto merge main into base-tm-ui"
+          git push origin base-tm-ui
+
   merge-to-base-skiyee-ui:
     name: Merge main into base-skiyee-ui
     runs-on: ubuntu-latest