From 7049d82e4117ea75dcbb3657d06634d06407f294 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 02 七月 2025 18:40:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 fae271e..9370cdd 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;
@@ -63,15 +67,7 @@
 
     /** 鍟嗗搧id */
     @ApiModelProperty("鍟嗗搧id")
-    private String goodsId;
-
-    /** 鍟嗗搧鏌ョ湅娆℃暟 */
-    @ApiModelProperty("鍟嗗搧鏌ョ湅娆℃暟")
-    private Long goodsViewNum;
-
-    /** 鍟嗗搧涓嬪崟娆℃暟 */
-    @ApiModelProperty("鍟嗗搧涓嬪崟娆℃暟")
-    private Long goodsOrderNum;
+    private List<VideoGoodsDetailVO> goodsList;
 
     /** 鏄惁鎺ㄨ崘 */
     @ApiModelProperty("鏄惁鎺ㄨ崘")
@@ -83,15 +79,19 @@
 
     /** 鎾斁閲� */
     @ApiModelProperty("鎾斁閲�")
-    private Long playNum;
+    private Integer playNum;
 
     /** 鏀惰棌鏁� */
     @ApiModelProperty("鏀惰棌鏁�")
-    private Long collectNum;
+    private Integer collectNum;
 
     /** 璇勮鏁� */
     @ApiModelProperty("璇勮鏁�")
-    private Long commentNum;
+    private Integer commentNum;
+
+    /** 鐐硅禐鏁� */
+    @ApiModelProperty("鐐硅禐鏁�")
+    private Integer thumbsUpNum;
 
     /** 鏉冮噸 */
     @ApiModelProperty("鏉冮噸")
@@ -101,6 +101,8 @@
     @ApiModelProperty("瀹℃牳閫氳繃鏃堕棿")
     private Date auditPassTime;
 
+
+
     public static VideoVO getVoByEntity(@NonNull Video entity, VideoVO vo) {
         if(vo == null) {
             vo = new VideoVO();

--
Gitblit v1.8.0