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

zxl

7 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java

@@ -101,6 +101,8 @@
    @ApiModelProperty("审核通过时间")
    private Date auditPassTime;



    public static VideoVO getVoByEntity(@NonNull Video entity, VideoVO vo) {
        if(vo == null) {
            vo = new VideoVO();