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/WxVideoVO.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 9a7a98e..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
@@ -42,8 +42,29 @@
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;
+
+ @ApiModelProperty("瑙嗛鏃堕暱锛氱")
+ private Long videoDuration;
/** 瑙嗛濉厖妯″紡 */
@ApiModelProperty("瑙嗛濉厖妯″紡")
@@ -55,7 +76,7 @@
/** 鍟嗗搧淇℃伅 */
@ApiModelProperty("鍟嗗搧淇℃伅")
- private VideoGoodsVO goods;
+ private List<VideoGoodsDetailVO> goodsList;
@ApiModelProperty("褰撳墠鐢ㄦ埛鏄惁鏀惰棌浜嗚瑙嗛")
private Boolean collected = Boolean.FALSE;
@@ -68,6 +89,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