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

peng

2025-10-11 8fd3db7778b3991810d33ac4dffd2f9031b106fc

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