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

xiangpei

6 小时以前 3c378a12577695f4de03fd2fbe83c033f1369c3f

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

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

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

}