Merge remote-tracking branch 'origin/master'

doum

2026-01-30 fad455d8943bd6af1501f7dca62f9530ed7d19cc

 server/admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Member;
import com.doumee.core.utils.Utils;
import com.doumee.service.business.MemberService;
@@ -19,6 +20,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.File;
import java.util.List;

/**
 * 会员信息表Controller定义
@@ -64,13 +66,25 @@
        memberService.updateById(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("修改状态")
    @PostMapping("/updateStatus")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateStatus( @RequestBody Member param) {
        memberService.updateStatus(param);
        return ApiResponse.success(null);
    }
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
        return ApiResponse.success(memberService.findPage(pageWrap));
    }
    @ApiOperation("分页查询")
    @PostMapping("/list")
    @RequiresPermissions("business:member:query")
    public ApiResponse<List<Member>> findList (@RequestBody Member  pageWrap) {
        return ApiResponse.success(memberService.findList(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")