Merge remote-tracking branch 'origin/master'

doum

23 小时以前 0982a97b0c65e11034b9d6b00cc0e4aba39254be

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

@@ -80,13 +80,6 @@
        memberService.updateShop(member);
        return ApiResponse.success(null);
    }
    @ApiOperation("调整积分")
    @PostMapping("/updateIntegral")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateIntegral(@RequestBody Integral param) {
        memberService.updateIntegral(param);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")