diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index c1a9d78..b1ea5c2 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -42,3 +42,39 @@ jobs:
           git checkout base-sard-ui
           git merge main --no-ff -m "Auto merge main into base-sard-ui"
           git push origin base-sard-ui
+
+  merge-to-base-uv-ui:
+    name: Merge main into base-uv-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-uv-ui
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout base-uv-ui
+          git merge main --no-ff -m "Auto merge main into base-uv-ui"
+          git push origin base-uv-ui
+
+  merge-to-base-uview-plus:
+    name: Merge main into base-uview-plus
+    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-uview-plus
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout base-uview-plus
+          git merge main --no-ff -m "Auto merge main into base-uview-plus"
+          git push origin base-uview-plus
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f56793f..10823bf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -41,6 +41,7 @@
     "tabbar",
     "Toutiao",
     "unibest",
+    "uview",
     "uvui",
     "Wechat",
     "WechatMiniprogram",