From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期五, 12 八月 2022 16:59:06 +0800 Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master --- incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java index 3ffa1fd..32f3412 100644 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java +++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java @@ -9,6 +9,26 @@ public class AccidentReportDetailRespDTO { + private List<AccidentExpressFileRespDTO> expressFileList; + + public List<AccidentExpressFileRespDTO> getExpressFileList() { + return expressFileList; + } + + public void setExpressFileList(List<AccidentExpressFileRespDTO> expressFileList) { + this.expressFileList = expressFileList; + } + + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + private String fillInUserName; public String getFillInUserName() { @@ -62,8 +82,6 @@ private Long id; - private Boolean status ; - private Long accidentExpressId; private String accidentType; @@ -105,14 +123,6 @@ private String otherMaterials; private List<AccidentReportFileRespDTO> fileList; - - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } public Long getId() { return id; -- Gitblit v1.9.2