From 3b2c5fb47caca6ab286e0c8ed8c0575024c528d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 09:18:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
index 22b9557..f551cc8 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeActivityQuery.java
@@ -33,5 +33,9 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date endTime;
+
+ private String enableStatus;
+
+ private Boolean popup;
}
--
Gitblit v1.8.0