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

peng

2 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 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("成功");
    }