Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-07-27 38a2db2a4b3a67e27d874f0f2fdb64cff3325ccf

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressPageRespDTO.java

@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.incidentManage.model.dto.resp;


import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Date;
import java.util.List;

@@ -14,6 +16,7 @@

    private String accidentCause;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;

    private String occurrencePlace;