Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

 Conflicts:

	build/vite/optimize.ts

src/api/system/notify/template/index.ts

@@ -39,7 +39,7 @@ export const updateNotifyTemplate = async (data: NotifyTemplateVO) => {
 }
 
 // 删除站内信模板
-export const deleteNotifyTemplateApi = async (id: number) => {
+export const deleteNotifyTemplate = async (id: number) => {
   return await request.delete({ url: '/system/notify-template/delete?id=' + id })
 }
 

src/api/system/oauth2/token.ts

@@ -17,6 +17,6 @@ export const getAccessTokenPage = (params: PageParam) => {
 }
 
 // 删除 token
-export const deleteAccessToken = (accessToken: number) => {
+export const deleteAccessToken = (accessToken: string) => {
   return request.delete({ url: '/system/oauth2-token/delete?accessToken=' + accessToken })
 }