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

peng

2 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 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));
    }
}