From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/WithdrawService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/WithdrawService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/WithdrawService.java
index e61bc71..4b2f544 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/WithdrawService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/WithdrawService.java
@@ -32,8 +32,11 @@
* @param page 分页
* @return 分页列表
*/
- Page<UserWithdrawRecordVO> withdrawPage(String nickname, String userPhone, String applyForTime,
+ Page<UserWithdrawRecordVO> withdrawPage(List<Integer> userIds,String nickname, String userPhone, String applyForTime,
Integer state, Page<UserWithdrawRecordVO> page);
+ Page<UserWithdrawRecordVO> withdrawPage1(List<String> cityList,List<Integer> userIds,String nickname, String userPhone, String applyForTime,
+ Integer state, Page<UserWithdrawRecordVO> page,List<String> siteIds);
+
/**
* 根据筛选条件查询数据
@@ -84,6 +87,7 @@
* @return 分页列表
*/
Page<UserWithdrawRecordVO> withdrawList(Integer userId, Page<UserWithdrawRecordVO> page);
+ Page<UserWithdrawRecordVO> withdrawList1(List<String> cityList,Integer userId, Page<UserWithdrawRecordVO> page,List<String> siteIds);
/**
* 用户端-提交提现申请
--
Gitblit v1.7.1