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

 Conflicts:

	src/views/member/user/index.vue

src/api/member/address/index.ts

@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+export interface AddressVO {
+  id: number
+  name: string
+  mobile: string
+  areaId: number
+  detailAddress: string
+  defaultStatus: boolean
+}
+
+// 查询用户收件地址列表
+export const getAddressPage = async (params) => {
+  return await request.get({ url: `/member/address/page`, params })
+}
+
+// 查询用户收件地址详情
+export const getAddress = async (id: number) => {
+  return await request.get({ url: `/member/address/get?id=` + id })
+}
+
+// 新增用户收件地址
+export const createAddress = async (data: AddressVO) => {
+  return await request.post({ url: `/member/address/create`, data })
+}
+
+// 修改用户收件地址
+export const updateAddress = async (data: AddressVO) => {
+  return await request.put({ url: `/member/address/update`, data })
+}
+
+// 删除用户收件地址
+export const deleteAddress = async (id: number) => {
+  return await request.delete({ url: `/member/address/delete?id=` + id })
+}
+
+// 导出用户收件地址 Excel
+export const exportAddress = async (params) => {
+  return await request.download({ url: `/member/address/export-excel`, params })
+}

src/api/member/user/index.ts

@@ -1,21 +1,21 @@
 import request from '@/config/axios'
 
 export interface UserVO {
+  areaId: number | undefined
+  areaName: string | undefined
+  avatar: string | undefined
+  birthday: number | undefined
+  createTime: number | undefined
   id: number
-  mobile: string
-  password: string
-  status: number
-  registerIp: string
+  loginDate: number | undefined
   loginIp: string
-  loginDate: Date
-  nickname: string
-  avatar: string
-  name: string
-  sex: number
-  areaId: number
-  birthday: Date
   mark: string
-  createTime: Date
+  mobile: string
+  name: string | undefined
+  nickname: string | undefined
+  registerIp: string
+  sex: number
+  status: number
 }
 
 // TODO @梦：和 UserVO 搞成一个把。
@@ -32,6 +32,7 @@ export interface UserBaseInfoVO {
   name: string | null | undefined
   sex: number
   areaId: number | null | undefined
+  areaName: string | null | undefined
   birthday: Date | null | undefined
   mark: string | null | undefined
   createTime: Date | null | undefined