From f66cd5340a8c9a5264c82549f25e4d88cf2d815a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 五月 2024 15:54:18 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
index 7e68638..d1f11ac 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
@@ -2,11 +2,11 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.member.DTO.MemberDTO;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.domain.pojo.MemberPoints;
import com.ruoyi.member.service.IMemberPointsService;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,7 +31,7 @@
@RequestMapping("/getMemberPoints")
@ResponseBody
@ApiOperation(value = "获取用户积分")
- public R<List<MemberPoints>> getMemberPoints(MemberDTO memberDTO) {
+ public R<PageDTO<MemberPoints>> getMemberPoints(MemberDTO memberDTO) {
return R.ok(iMemberPointsService.getMemberPoints(memberDTO));
}
}
--
Gitblit v1.7.1