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

peng

2 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

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