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

songhuangfeng123

2022-07-27 9ac04e8335b18ffbe2a3d7bc16f9f51a7404ec85

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java

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

import com.gkhy.safePlatform.incidentManage.entity.AccidentExpressFileInfoDO;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Date;
import java.util.List;
@@ -19,6 +19,7 @@

    private String accidentCause;

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

    private String occurrencePlace;