From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
index a2e1aa1..d98dca1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
@@ -2,6 +2,7 @@
import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -68,15 +69,19 @@
/**
* 宣传类型 列: propaganda_type
*/
- private Integer propagandaType;
+ private String propagandaType;
/**
* 宣传时间 列: propaganda_time
*/
private Date propagandaTime;
/**
- * 当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 列: event_type
+ * 当event_type_category是1填写事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 列: event_type
*/
private Integer eventType;
+ /**
+ * 事件类型 列: event_clazz
+ */
+ private String eventClazz;
/**
* 事件描述 列: event_des
*/
@@ -98,9 +103,13 @@
*/
private Date happenTime;
/**
- * 发生地点 列: happent_address
+ * 事件发生地点备注 列: happent_address
*/
private String happentAddress;
+ /**
+ * 事件发生地点 列: happen_address
+ */
+ private String happenAddress;
/**
* 发生的精度纬度信息（逗号隔开） 列: happent_lat_lng
*/
@@ -121,6 +130,10 @@
* 处理人ID 列: process_user_id
*/
private Long processUserId;
+ /**
+ * 处理流程记录ID 列: process_record_id
+ */
+ private Long processRecordId;
/**
* 处理人名称 列: process_user_name
*/
@@ -182,6 +195,10 @@
*/
private Date submitDate;
/**
+ * 事件处理状态 列: event_deal_status
+ */
+ private Integer eventDealStatus;
+ /**
* 创建人 列: create_by
*/
private Long createBy;
@@ -199,4 +216,15 @@
*/
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+
+ private Boolean upload;
+
+ /**
+ * 撤销人/社区ID 列: revoke_id
+ */
+ private Long revokeId;
+ /**
+ * 修改时间 列: revoke_type
+ */
+ private Integer revokeType;
}
\ No newline at end of file
--
Gitblit v1.7.1