From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java
index a8338c8..d67b066 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java
@@ -60,6 +60,11 @@
private String activityImgUrl;
+ //鏄惁鑳借缃鍝�
+ private boolean canSet;
+
+ //鏄惁鏄脊绐楁椿鍔�
+ private Boolean popup;
public static PrizeActivityVO getVoByEntity(@NonNull PrizeActivity entity, PrizeActivityVO vo) {
if(vo == null) {
--
Gitblit v1.8.0