From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
index 17825aa..960be3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
@@ -1,14 +1,14 @@
package com.panzhihua.common.model.vos.grid;
-import java.util.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
*
@@ -16,39 +16,38 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("事件或者走访中关联的图片音频和视频文件返回参数")
public class EventResourceVO {
@ApiModelProperty(value = "分类（1、事件 2、走访 3、事件流转））")
- private Integer classification;
+ private Integer classification;
@ApiModelProperty(value = "事件或者走访任务关联ID")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
@ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)")
- private Integer type;
+ private Integer type;
@ApiModelProperty(value = "资源名称")
- private String resourceName;
+ private String resourceName;
@ApiModelProperty(value = "资源大小")
- private String resourceSize;
+ private String resourceSize;
- @ApiModelProperty(value = "资源时长")
- private Integer resourceTime;
+ @ApiModelProperty(value = "资源时长")
+ private Integer resourceTime;
@ApiModelProperty(value = "事件上传的资源URL地址")
- private String url;
+ private String url;
@ApiModelProperty(value = "创建人")
- private Long createBy;
+ private Long createBy;
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createAt;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
}
--
Gitblit v1.7.1