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

peng

2025-10-11 cdbed525ab8395e916b2874ff9e7d59742f320b1

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java

@@ -60,8 +60,12 @@

    private String activityImgUrl;

    //是否能设置奖品
    private boolean canSet;

    //是否是弹窗活动
    private Boolean popup;

    public static PrizeActivityVO getVoByEntity(@NonNull PrizeActivity entity, PrizeActivityVO vo) {
        if(vo == null) {
            vo = new PrizeActivityVO();