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

Conflicts: src/views/mall/promotion/combination/record/index.vue
2023-08-23 00:49:48 +08:00
parent cfbc2ed74c d096e6e712
commit 746bf864d9
14 changed files with 675 additions and 12 deletions
--- a/src/api/member/signin/record/index.ts
+++ b/src/api/member/signin/record/index.ts
@ -6,6 +6,15 @@ export interface SignInRecordVO {
  day: number
  point: number
 }
+export interface SignInRecordQueryVO {
+  pageNo: number
+  pageSize: number
+  userId?: number
+  nickname: number | undefined | null
+  day?: number | null | undefined
+  point?: number | null | undefined
+  createTime: string[] | null | undefined
+}

 // 查询用户签到积分列表
 export const getSignInRecordPage = async (params) => {