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

peng

7 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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

@@ -77,7 +77,7 @@
            this.saveBatch(activityRefPrizeList);
        }

        return Result.ok();
        return Result.ok("成功");
    }


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

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