From 23de473eca0e0fc862706b0e19a9185bbe6517fa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 21 Dec 2021 10:54:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/resources/mapper/modules/VideoCollectionMapper.xml | 2 +-
src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java | 2 +-
2 files changed, 2 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 b08426c..5866c49 100644
--- a/src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java
+++ b/src/main/java/cc/mrbird/febs/video/vo/ApiMyVideoHistoryVo.java
@@ -33,5 +33,5 @@
private Long sourceId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createdTime;
+ private Date updatedTime;
}
diff --git a/src/main/resources/mapper/modules/VideoCollectionMapper.xml b/src/main/resources/mapper/modules/VideoCollectionMapper.xml
index 10b00a2..2beb52e 100644
--- a/src/main/resources/mapper/modules/VideoCollectionMapper.xml
+++ b/src/main/resources/mapper/modules/VideoCollectionMapper.xml
@@ -21,7 +21,7 @@
<select id="selectApiMyVideoHistoryInPage" resultType="cc.mrbird.febs.video.vo.ApiMyVideoHistoryVo">
select
a.video_id id,
- a.created_time createdTime,
+ a.updated_time updatedTime,
b.title title,
b.intro intro,
b.thumb thumb,
--
Gitblit v1.9.1