From 3c378a12577695f4de03fd2fbe83c033f1369c3f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 29 六月 2025 19:58:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java
index 791a4bb..4ef60fe 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java
@@ -4,11 +4,12 @@
import cn.lili.group.Add;
import cn.lili.base.AbsForm;
import cn.lili.modules.lmk.domain.entity.Video;
-import org.hibernate.validator.constraints.Length;
+import cn.lili.modules.lmk.domain.vo.VideoGoodsPublishVO;
import org.springframework.beans.BeanUtils;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
import org.springframework.lang.NonNull;
import io.swagger.annotations.ApiModel;
@@ -29,7 +30,7 @@
public class WxVideoForm extends AbsForm {
- @NotBlank(message = "瑙嗛涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotBlank(message = "瑙嗛涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("瑙嗛")
private String videoFileKey;
@@ -38,7 +39,7 @@
private String title;
@ApiModelProperty("瑙嗛灏侀潰")
- @NotBlank(message = "瑙嗛灏侀潰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @NotBlank(message = "瑙嗛灏侀潰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
private String cover;
@ApiModelProperty("瑙嗛鍐呭绫诲瀷锛氳棰戙�佸浘鐗�")
@@ -49,12 +50,12 @@
private List<String> videoImgs;
@ApiModelProperty("瑙嗛鏍囩")
- @Length(max = 5, message = "鏈�澶氬彧鑳芥坊鍔犱簲涓爣绛�")
+ @Size(max = 5, message = "鏈�澶氬彧鑳芥坊鍔犱簲涓爣绛�", groups = {Add.class, Update.class})
private List<WxVideoTagForm> tags = new ArrayList<>(2);
// @NotBlank(message = "鍟嗗搧id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍟嗗搧id")
- private String goodsId;
+ @ApiModelProperty("鍟嗗搧鍒楄〃")
+ private List<VideoGoodsPublishVO> goodsList;
@ApiModelProperty("瑙嗛濉厖妯″紡")
private String videoFit;
--
Gitblit v1.8.0