From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
index 52bc90a..5e310fa 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
@@ -139,7 +139,8 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- return R.ok(orderClient.orderList(userId, pageNum, pageSize).getData());
+ R<Page<Order>> iPageR = orderClient.orderList(userId, pageNum, pageSize);
+ return R.ok(iPageR.getData());
}
/**
@@ -266,7 +267,7 @@
@ApiImplicitParam(value = "审批意见", name = "opinion", dataType = "String"),
@ApiImplicitParam(value = "审批同意/不同意(1同意;2驳回)", name = "state", dataType = "Integer", required = true)
})
- public R<String> withdrawExamine(@RequestParam Integer id, @RequestParam Integer state, String opinion) {
+ public R<String> withdrawExamine(@RequestParam Long id, @RequestParam Integer state, String opinion) {
com.ruoyi.order.api.entity.Withdraw withdraw = withdrawClient.withdrawRecordDetail(id).getData();
if (null == withdraw) {
throw new GlobalException("提现记录不存在或已删除！");
--
Gitblit v1.7.1