From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
index 610d8a4..64a6930 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
@@ -46,7 +46,7 @@
@NotNull(message = "发生区域-网格ID不能为空")
private Long gridId;
- @Length(max=255)
+ @Length(max=500)
@ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
@NotNull(message = "事件描述不能为空")
private String eventDes;
@@ -86,9 +86,15 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
--
Gitblit v1.7.1