Merge branch 'dev' into send_coupon

peng

4 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeDrawServiceImpl.java

@@ -166,4 +166,9 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result grantRecord(String prizeActivityId) {
        return Result.ok().data(baseMapper.grantRecord(prizeActivityId));
    }
}