Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

Helius

2021-12-22 ac0bc5b39477de418b3c43eb40928310effa6114

Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

 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;


 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,