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/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java | 18 +++++++++++++++---
1 files changed, 15 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 6ec5817..9e280e2 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
@@ -68,7 +68,7 @@
/**
* 宣传类型 列: propaganda_type
*/
- private Integer propagandaType;
+ private String propagandaType;
/**
* 宣传时间 列: propaganda_time
*/
@@ -80,7 +80,7 @@
/**
* 事件类型 列: event_clazz
*/
- private Integer eventClazz;
+ private String eventClazz;
/**
* 事件描述 列: event_des
*/
@@ -102,9 +102,13 @@
*/
private Date happenTime;
/**
- * 发生地点 列: happent_address
+ * 事件发生地点备注 列: happent_address
*/
private String happentAddress;
+ /**
+ * 事件发生地点 列: happen_address
+ */
+ private String happenAddress;
/**
* 发生的精度纬度信息（逗号隔开） 列: happent_lat_lng
*/
@@ -125,6 +129,10 @@
* 处理人ID 列: process_user_id
*/
private Long processUserId;
+ /**
+ * 处理流程记录ID 列: process_record_id
+ */
+ private Long processRecordId;
/**
* 处理人名称 列: process_user_name
*/
@@ -186,6 +194,10 @@
*/
private Date submitDate;
/**
+ * 事件处理状态 列: event_deal_status
+ */
+ private Integer eventDealStatus;
+ /**
* 创建人 列: create_by
*/
private Long createBy;
--
Gitblit v1.7.1