Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

1 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java

@@ -53,7 +53,7 @@
    }

    @RequestMapping(value = "/pageMerMember", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户绑定会员列表")
    @ApiOperation(value = "分页获取商户绑定会员列表【2.0】")
    public R<Page<MerMemberPageVo>> pageMerMember(@RequestBody MerMemberPageDto merMemberPageDto) {
        Long userId = SecurityUtils.getUserId();
        Page<MerMemberPageVo> page = new Page<>();