From 30b41cc526165b70e04a1fe1438cb79bb035a7bf Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 13 六月 2025 11:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 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 3600fa2..179415f 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
@@ -35,11 +35,30 @@
     /** 鍥剧墖灏侀潰 */
     @ApiModelProperty("鍥剧墖灏侀潰")
     private String coverUrl;
+    private String coverFileKey;
 
     /** 瑙嗛鍦板潃 */
     @ApiModelProperty("瑙嗛鍦板潃")
     private String videoFileKey;
     private String videoUrl;
+
+    /**
+     * @see cn.lili.modules.lmk.enums.general.VideoContentTypeEnum
+     */
+    @ApiModelProperty("瑙嗛鍐呭绫诲瀷锛氳棰戙�佸浘鐗�")
+    private String videoContentType;
+
+    /**
+     * @see cn.lili.modules.lmk.enums.general.VideoTypeEnum
+     */
+    @ApiModelProperty("瑙嗛绫诲瀷锛氳棰戙�佸ぇ鍋ュ悍銆佺鍘�")
+    private String videoType;
+
+    @ApiModelProperty("鍥鹃泦-json鏁扮粍")
+    private String videoImgs;
+
+    @ApiModelProperty("鍥鹃泦")
+    private List<String> imgs;
 
     @ApiModelProperty("瑙嗛鏍囩")
     private List<SimpleVideoTagVO> tagList;
@@ -67,6 +86,13 @@
     @ApiModelProperty("璇勮鏁�")
     private Long commentNum;
 
+    /** 瑙嗛鎷ユ湁鐨勬搷浣� */
+    @ApiModelProperty("瑙嗛鏀寔鐨勬搷浣�")
+    private List<VideoOption> options;
+
+    @ApiModelProperty("瑙嗛鐘舵��")
+    private String status;
+
 
     public static WxVideoVO getVoByEntity(@NonNull Video entity, WxVideoVO vo) {
         if(vo == null) {

--
Gitblit v1.8.0