From ac0bc5b39477de418b3c43eb40928310effa6114 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Dec 2021 14:14:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

---
 src/main/resources/mapper/modules/VideoCollectionMapper.xml    |    3 ++-
 src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java b/src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java
index 5866c49..5ed8eda 100644
--- a/src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java
+++ b/src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java
@@ -11,9 +11,12 @@
 @ApiModel(value = "ApiMyVideoHistoryVo", description = "返回参数类")
 public class ApiMyVideoHistoryVo {
 
-    @ApiModelProperty(value = "视频ID")
+    @ApiModelProperty(value = "历史记录ID")
     private Long id;
 
+    @ApiModelProperty(value = "视频ID")
+    private Long videoId;
+
     @ApiModelProperty(value = "标题")
     private String title;
 
diff --git a/src/main/resources/mapper/modules/VideoCollectionMapper.xml b/src/main/resources/mapper/modules/VideoCollectionMapper.xml
index 2beb52e..2eb7e09 100644
--- a/src/main/resources/mapper/modules/VideoCollectionMapper.xml
+++ b/src/main/resources/mapper/modules/VideoCollectionMapper.xml
@@ -20,7 +20,8 @@
 
     <select id="selectApiMyVideoHistoryInPage" resultType="cc.mrbird.febs.video.vo.ApiMyVideoHistoryVo">
         select
-        a.video_id id,
+        a.id id,
+        a.video_id videoId,
         a.updated_time updatedTime,
         b.title title,
         b.intro intro,

--
Gitblit v1.9.1