From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
index ab61c97..f403b6c 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
@@ -16,7 +16,7 @@
import java.util.List;
@Data
-@ApiModel(value = "Activity鏌ヨ鍙傛暟", description = "娲诲姩鏌ヨ〃鍗�")
+@ApiModel(value = "Activity鍝嶅簲鏁版嵁", description = "鍝嶅簲鏁版嵁")
public class ActivityVO extends AbsVo {
/** 娲诲姩鍚嶇О */
@@ -84,7 +84,34 @@
/** 鎶ュ悕浜哄憳闆嗗悎*/
private List<MemberVO> members;
+ /**
+ * 鏄惁鎶ュ悕
+ */
+ private Boolean isReport;
+ /**
+ * 鏄惁鍙戝竷
+ */
+ private Boolean publish;
+
+ /**
+ * 娲诲姩瀹℃牳璁板綍闆嗗悎
+ */
+ private List<ActivityAuditRecordVO> auditRecordVOS;
+ /**
+ * 瀹℃牳鐘舵�� 0 鏈鏍革紝 1 宸插鏍�
+ */
+ private Integer auditStatus;
+
+ /**
+ * 娲诲姩鐢宠浜篿d
+ */
+ private String memberId;
+
+ /**
+ * 鏄惁鏀惰棌
+ */
+ private Boolean isCollect;
public static ActivityVO getVoByEntity(@NonNull Activity entity, ActivityVO vo) {
if(vo == null) {
vo = new ActivityVO();
--
Gitblit v1.8.0