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

huanghongfa

2021-06-05 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java

@@ -1,11 +1,9 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;


@@ -50,6 +48,10 @@
     */
    private String resourceSize;
    /**
     * 视频或音频时长   列: resource_time
     */
    private Integer resourceTime;
    /**
     * 事件上传的资源URL地址   列: url
     */
    private String url;