Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

 src/main/java/com/mzl/flower/web/member/MemberController.java

@@ -38,8 +38,8 @@

    private final MemberGrowthRecordService memberGrowthRecordService;

    @PostMapping("/member/list")
    @ApiOperation(value = "会员列表", httpMethod = "POST")
    @GetMapping("/member/list")
    @ApiOperation(value = "会员列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<MemberVO>>> getMemberList(Page page, MemberQueryDTO dto) {
        return returnData(R.SUCCESS.getCode(), memberService.queryPage(dto, page));
    }