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

peng

4 天以前 1fdfb56613adca09a0ddf39289b41f96fa335a01

 framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java

@@ -42,7 +42,9 @@
    @ApiModelProperty(value = "浏览类型：goods商品、view视频")
    private String viewType;

    @ApiModelProperty(value = "观看时长：秒")
    @ApiModelProperty(value = "观看时长：毫秒")
    private Long viewDuration;

    @ApiModelProperty(value = "播放至：毫秒")
    private String playAt;
}