From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IntegralClient.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IntegralClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IntegralClient.java
index 3f47e33..4b937be 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IntegralClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/IntegralClient.java
@@ -1,5 +1,6 @@
 package com.dsh.course.feignClient.account;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsh.course.feignClient.account.model.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,6 +13,6 @@
 
 
     @PostMapping("/userIntegralChanges/list")
-    List<UserIntegral> list(IntegralListQuery integralListQuery);
+    Page<UserIntegral> list(IntegralListQuery integralListQuery);
 
 }

--
Gitblit v1.7.1