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

# Conflicts:
#	src/views/Login/components/RegisterForm.vue

src/api/login/index.ts

 import request from '@/config/axios'
 import request from '@/config/axios'
 import { getRefreshToken } from '@/utils/auth'
 import { getRefreshToken } from '@/utils/auth'
-import type { UserLoginVO } from './types'
+import type { RegisterVO, UserLoginVO } from './types'
 
 
 export interface SmsCodeVO {
 export interface SmsCodeVO {
   mobile: string
   mobile: string
@@ -17,6 +17,11 @@ export const login = (data: UserLoginVO) => {
   return request.post({ url: '/system/auth/login', data })
   return request.post({ url: '/system/auth/login', data })
 }
 }
 
 
+// 注册
+export const register = (data: RegisterVO) => {
+  return request.post({ url: '/system/auth/register', data })
+}
+
 // 刷新访问令牌
 // 刷新访问令牌
 export const refreshToken = () => {
 export const refreshToken = () => {
   return request.post({ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken() })
   return request.post({ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken() })

src/api/login/types.ts

@@ -29,3 +29,10 @@ export type UserVO = {
   loginIp: string
   loginIp: string
   loginDate: string
   loginDate: string
 }
 }
+
+export type RegisterVO = {
+  tenantName: string
+  username: string
+  password: string
+  captchaVerification: string
+}