From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 04 六月 2025 16:35:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java | 4 +++- 1 files changed, 3 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..a239abb 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 { /** 娲诲姩鍚嶇О */ @@ -85,6 +85,8 @@ /** 鎶ュ悕浜哄憳闆嗗悎*/ private List<MemberVO> members; + private Boolean isReport; + public static ActivityVO getVoByEntity(@NonNull Activity entity, ActivityVO vo) { if(vo == null) { vo = new ActivityVO(); -- Gitblit v1.8.0