From 8065107726ad1fc13591c9bc47819207948bc45c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 15 六月 2025 19:28:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 ab5fce0..4a884ca 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,6 +4,8 @@
 import cn.lili.group.Add;
 import cn.lili.base.AbsForm;
 import cn.lili.modules.lmk.domain.entity.Video;
+import cn.lili.modules.lmk.domain.vo.VideoGoodsPublishVO;
+import cn.lili.modules.lmk.domain.vo.VideoGoodsVO;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.BeanUtils;
 
@@ -53,8 +55,8 @@
     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