From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
index 6616844..1cdcf70 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
@@ -39,15 +39,15 @@
}
@PostMapping("/userIntegralChanges/list")
- public List<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
+ public Page<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
try {
Page<UserIntegral> userIntegralPage = new Page<>(integralListQuery.getOffset(), integralListQuery.getLimit());
- List<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
+ Page<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
return list;
}catch (Exception e){
e.printStackTrace();
- return new ArrayList<>();
+ return new Page<>();
}
}
}
--
Gitblit v1.7.1