Merge remote-tracking branch 'origin/master'

doum

9 分钟以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java

@@ -43,8 +43,9 @@
        return ApiResponse.success(integralService.findIntegralRecordPage(pageWrap));
    }


    @LoginRequired
    @ApiOperation("获取用户剩余积分与待情况积分信息")
    @ApiOperation("获取用户剩余积分与待清空积分信息")
    @PostMapping("/getIntegralData")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),