Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out int...

songhuangfeng123

2022-08-12 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java

@@ -11,10 +11,36 @@
@TableName("accident_report")
public class AccidentReportInfoDetailDO {

    private Integer status;

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    private String fillInUserName;

    public String getFillInUserName() {
        return fillInUserName;
    }

    public void setFillInUserName(String fillInUserName) {
        this.fillInUserName = fillInUserName;
    }

    private String accidentName;

    private Long accidentDepartmentId;

    private Date occurrenceTime;

    private String occurrencePlace;

    @TableId(type = IdType.AUTO)
    private Long id;

    private Boolean status ;

    private Long accidentExpressId;

@@ -53,14 +79,6 @@
    private String relevantPersonnelRecords;

    private String otherMaterials;

    public Boolean getStatus() {
        return status;
    }

    public void setStatus(Boolean status) {
        this.status = status;
    }

    public Long getId() {
        return id;
@@ -222,6 +240,38 @@
        this.otherMaterials = otherMaterials;
    }

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Long getAccidentDepartmentId() {
        return accidentDepartmentId;
    }

    public void setAccidentDepartmentId(Long accidentDepartmentId) {
        this.accidentDepartmentId = accidentDepartmentId;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    public String getOccurrencePlace() {
        return occurrencePlace;
    }

    public void setOccurrencePlace(String occurrencePlace) {
        this.occurrencePlace = occurrencePlace;
    }

    @Override
    public String toString() {
        return "AccidentReportInfo{" +