Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-05 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java

@@ -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;