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

zxl

7 天以前 3fdceb6011f62d5d2a9d26f5f840f75055506226

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

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

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

}