From cd7bec2448443f88eee6f73df68df829fc95eed9 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 29 六月 2021 11:25:24 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCompleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java
similarity index 74%
rename from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCompleteDTO.java
rename to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java
index fbdf1db..a0ce11a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCompleteDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java
@@ -1,5 +1,6 @@
-package com.panzhihua.common.model.vos.visit;
+package com.panzhihua.common.model.dtos.visit;
+import com.panzhihua.common.model.dtos.EventResourceDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,7 +34,7 @@
@ApiModelProperty("地址备注")
private String addressRemark;
- @ApiModelProperty("异常类型")
+ @ApiModelProperty("0正常，1异常")
private Integer exception;
@ApiModelProperty("异常描述")
@@ -52,16 +53,22 @@
private Integer eventStatus;
+ @ApiModelProperty("生活来源")
+ private String remark;
+
+ @ApiModelProperty("完成时间")
+ @NotEmpty(message = "完成时间不能为空")
+ private String submitDate;
+
@ApiModelProperty(value = "音频列表")
- List<String> vosList;
+ List<EventResourceDTO> vosList;
@ApiModelProperty(value = "图片列表")
- List<String> imgList;
+ List<EventResourceDTO> imgList;
@ApiModelProperty(value = "视频列表")
- List<String> videoList;
+ List<EventResourceDTO> videoList;
-
-
+ private Long userId;
}
--
Gitblit v1.7.1