From 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 08 九月 2025 13:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeActivityVO.java | 4 ++++
1 files changed, 4 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 5b16419..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,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();
--
Gitblit v1.8.0