From 5194c4fa5ae97afd8a83abb8400ff176db78b3ea Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 13 一月 2025 09:21:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java
index 5625fcb..1c24bf8 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TWithdrawalController.java
@@ -9,6 +9,7 @@
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITWithdrawalService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
@@ -17,8 +18,8 @@
/**
* 提现相关控制器
*/
-@RestController
-@RequestMapping("/api/withdrawal")
+@Controller
+@RequestMapping("/withdrawal")
public class TWithdrawalController extends BaseController {
@Autowired
@@ -62,7 +63,7 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String insertTime,
- String receivePaymentName,
+ String driverName,
Integer status) {
String beginTime = null;
String endTime = null;
@@ -72,7 +73,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(withdrawalService.getWithdrawalList(page,beginTime,endTime,receivePaymentName,status));
+ page.setRecords(withdrawalService.getWithdrawalList(page,beginTime,endTime,driverName,status));
return super.packForBT(page);
}
--
Gitblit v1.7.1