diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 33b6e00..5727846 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -24,6 +24,7 @@ jobs: - name: Automerge uses: 'pascalgn/automerge-action@v0.14.3' env: + BASE_BRANCHES: 'release' GITHUB_TOKEN: '${{ secrets.TOKEN }}' MERGE_LABELS: '' MERGE_FILTER_AUTHOR: 'kailong321200875' diff --git a/package.json b/package.json index 843c13d..bc28bcc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "1.9.9", + "version": "2.0。0", "description": "一套基于vue3、element-plus、typesScript、vite4的后台集成方案。", "author": "Archer <502431556@qq.com>", "private": false,