From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java | 5 ++++-
1 files changed, 4 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 f6c7f77..c129ee2 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
@@ -62,7 +62,6 @@
private Date endTime;
/** 娲诲姩鐘舵�� */
- @NotBlank(message = "娲诲姩鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty(value = "娲诲姩鐘舵��")
private String status;
@@ -93,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