From 745af316b6f14cc97f6cb64d56eda4cb68960c3e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 17 六月 2025 10:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java
index 179415f..d324ee0 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java
@@ -73,7 +73,7 @@
 
     /** 鍟嗗搧淇℃伅 */
     @ApiModelProperty("鍟嗗搧淇℃伅")
-    private VideoGoodsVO goods;
+    private List<VideoGoodsDetailVO> goodsList;
 
     @ApiModelProperty("褰撳墠鐢ㄦ埛鏄惁鏀惰棌浜嗚瑙嗛")
     private Boolean collected = Boolean.FALSE;

--
Gitblit v1.8.0