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

peng

昨天 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 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();