From fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon

---
 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