From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
index 88e94ef..f6add1c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
@@ -36,16 +36,33 @@
     @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;
+
+
+    @ApiModelProperty(value = "是否验证:社区后台处理时必填", hidden = false, example = "true")
+    private Boolean needVerify;
 
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
     private Long userId;
 
     @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
     private String userName;
+
+    @ApiModelProperty(value = "(当前操作)用户类型:0网格员 1 社区后台", hidden = true, example = "1")
+    private Integer operateType;
+    @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1")
+    private Long communityId;
+    @ApiModelProperty(value = "(当前操作)用户社区名称", hidden = true, example = "学园社区")
+    private String communityName;
 }

--
Gitblit v1.7.1