Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-07-11 4e6d6e7c8e4ca42e96528a71162f5e58e473f652

 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 {

    /** 活动名称 */