From 4e6d6e7c8e4ca42e96528a71162f5e58e473f652 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
index e039cc6..afca6b5 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
@@ -20,7 +20,7 @@
import java.util.Date;
@Data
-@ApiModel(value = "Activity鏌ヨ鍙傛暟", description = "娲诲姩鏌ヨ〃鍗�")
+@ApiModel(value = "娲诲姩琛ㄥ崟", description = "娲诲姩琛ㄥ崟")
public class ActivityForm extends AbsForm {
/** 娲诲姩鍚嶇О */
@@ -92,6 +92,10 @@
@ApiModelProperty(value = "娲诲姩璇︾粏鍐呭锛堟敮鎸佸瘜鏂囨湰锛�", example = "<p>娲诲姩娴佺▼锛�...</p>")
private String activityContent;
+ /** 娲诲姩鍙戝竷 */
+ @ApiModelProperty(value = "娲诲姩鍙戝竷", example = "")
+ private Boolean publish;
+
public static Activity getEntityByForm(@NonNull ActivityForm form, Activity entity) {
if(entity == null) {
entity = new Activity();
--
Gitblit v1.8.0