Merge remote-tracking branch 'origin/dev' into dev

xiangpei

8 天以前 8065107726ad1fc13591c9bc47819207948bc45c

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java

@@ -30,6 +30,10 @@
    @ApiModelProperty("图片封面")
    private String coverUrl;

    /** 封面显示地址 */
    @ApiModelProperty("封面显示地址")
    private String coverShowUrl;

    /** 视频地址 */
    @ApiModelProperty("视频地址")
    private String videoFileKey;