Merge branch 'send_coupon' into user_action

peng

8 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java

@@ -56,7 +56,7 @@
    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(ScanPrizeQuery query) {
        return scanPrizeService.page(query);
        return scanPrizeService.page(query,"manager");
    }

    @GetMapping("/{id}")