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

zxl

9 天以前 d9901a1d21c42372d8b38a081844177e578980a6

 framework/src/main/java/cn/lili/modules/lmk/domain/form/VideoFootPrintForm.java

@@ -19,4 +19,7 @@
    @ApiModelProperty("观看时长")
    private Long viewDuration;

    @ApiModelProperty("视频播放至")
    private String playAt;

}