Merge branch 'dev-mitao'

mitao

2024-05-27 95163bc7f6714edcb14dd4369717b0a9d1ae15da

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java

@@ -2,18 +2,15 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.DTO.MemberDTO;
import com.ruoyi.member.domain.pojo.MemberPoints;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.domain.MemberPoints;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.member.service.IMemberPointsService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -31,7 +28,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));
    }
}