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/ActivityReportVO.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java
index a2dfb23..df72a3d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityReportVO.java
@@ -1,8 +1,12 @@
package cn.lili.modules.lmk.domain.vo;
import cn.lili.base.AbsVo;
+import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
@Data
@ApiModel(value = "ActivityReport涓棿琛ㄥ搷搴旀暟鎹�", description = "鍝嶅簲鏁版嵁")
@@ -12,4 +16,14 @@
/** 鐢ㄦ埛id*/
private String userId;
+
+ private Boolean cancel;
+
+ public static ActivityReportVO getVoByEntity(@NonNull ActivityReport entity, ActivityReportVO vo) {
+ if(vo == null) {
+ vo = new ActivityReportVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
}
--
Gitblit v1.8.0