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

peng

5 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

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