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

zxl

5 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

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