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/form/ActivityReportForm.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java
new file mode 100644
index 0000000..2cfc624
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityReportForm.java
@@ -0,0 +1,34 @@
+package cn.lili.modules.lmk.domain.form;
+
+import cn.lili.base.AbsForm;
+import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.entity.ActivityReport;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel(value = "鎶ュ悕娲诲姩琛ㄥ崟", description = "鎶ュ悕娲诲姩琛ㄥ崟")
+public class ActivityReportForm extends AbsForm {
+
+    /** 娲诲姩id */
+    @ApiModelProperty(value = "娲诲姩id")
+    @NotBlank
+    private String activityId;
+
+    /** 鏄惁鍙栨秷鎶ュ悕 */
+    @ApiModelProperty(value = "鍙栨秷閭f姤鍚�")
+    private Boolean cancel;
+
+    public static ActivityReport getEntityByForm(@NonNull ActivityReportForm form, ActivityReport entity) {
+        if(entity == null) {
+            entity = new ActivityReport();
+        }
+        BeanUtils.copyProperties(form, entity);
+        return entity;
+    }
+}

--
Gitblit v1.8.0