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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

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

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

    @Override
    public String lockPrizeRef(String refId) {
       return baseMapper.lockPrizeRef(refId);
    }
}