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

peng

5 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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

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

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

}