From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java |    5 ++++-
 1 files changed, 4 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..827efa3 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
@@ -63,6 +63,9 @@
     @ApiModelProperty("瑙嗛鏍囩")
     private List<SimpleVideoTagVO> tagList;
 
+    @ApiModelProperty("瑙嗛鏃堕暱锛氱")
+    private Long videoDuration;
+
     /** 瑙嗛濉厖妯″紡 */
     @ApiModelProperty("瑙嗛濉厖妯″紡")
     private String videoFit;
@@ -73,7 +76,7 @@
 
     /** 鍟嗗搧淇℃伅 */
     @ApiModelProperty("鍟嗗搧淇℃伅")
-    private VideoGoodsVO goods;
+    private List<VideoGoodsDetailVO> goodsList;
 
     @ApiModelProperty("褰撳墠鐢ㄦ埛鏄惁鏀惰棌浜嗚瑙嗛")
     private Boolean collected = Boolean.FALSE;

--
Gitblit v1.8.0