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

huanghongfa

2021-06-03 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java

@@ -33,6 +33,9 @@
    @ApiModelProperty(value = "资源大小")
   private String resourceSize;

   @ApiModelProperty(value = "资源时长")
   private Integer resourceTime;

    @ApiModelProperty(value = "事件上传的资源URL地址")
   private String url;