From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java
index 8f82ae3..0fc6690 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java
@@ -30,6 +30,10 @@
     @ApiModelProperty("鍥剧墖灏侀潰")
     private String coverUrl;
 
+    /** 灏侀潰鏄剧ず鍦板潃 */
+    @ApiModelProperty("灏侀潰鏄剧ず鍦板潃")
+    private String coverShowUrl;
+
     /** 瑙嗛鍦板潃 */
     @ApiModelProperty("瑙嗛鍦板潃")
     private String videoFileKey;
@@ -38,9 +42,24 @@
     @ApiModelProperty("瑙嗛鏍囩")
     private List<SimpleVideoTagVO> tagList;
 
+    @ApiModelProperty("瑙嗛鍐呭绫诲瀷锛氳棰戙�佸浘鐗�")
+    private String videoContentType;
+
+    @ApiModelProperty("瑙嗛绫诲瀷锛氳棰戙�佸ぇ鍋ュ悍銆佺鍘�")
+    private String videoType;
+
+    @ApiModelProperty(value = "鍥剧墖鍒楄〃锛宩son鏁扮粍", hidden = true)
+    private String videoImgs;
+
+    @ApiModelProperty("鍥剧墖鍒楄〃")
+    private List<String> imgs;
+
     /** 瑙嗛濉厖妯″紡 */
     @ApiModelProperty("瑙嗛濉厖妯″紡")
     private String videoFit;
+
+    @ApiModelProperty("瑙嗛闀垮害锛氱")
+    private Long videoDuration;
 
     /** 瑙嗛鏍囬 */
     @ApiModelProperty("瑙嗛鏍囬")
@@ -48,15 +67,7 @@
 
     /** 鍟嗗搧id */
     @ApiModelProperty("鍟嗗搧id")
-    private String goodsId;
-
-    /** 鍟嗗搧鏌ョ湅娆℃暟 */
-    @ApiModelProperty("鍟嗗搧鏌ョ湅娆℃暟")
-    private Long goodsViewNum;
-
-    /** 鍟嗗搧涓嬪崟娆℃暟 */
-    @ApiModelProperty("鍟嗗搧涓嬪崟娆℃暟")
-    private Long goodsOrderNum;
+    private List<VideoGoodsDetailVO> goodsList;
 
     /** 鏄惁鎺ㄨ崘 */
     @ApiModelProperty("鏄惁鎺ㄨ崘")

--
Gitblit v1.8.0