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

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

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

@@ -4,18 +4,33 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.math.BigDecimal;
import java.util.Date;

@TableName("accident_report")
public class AccidentReportInfoPageDO {

    private Integer status;

    public Integer getStatus() {
        return status;
    }

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

    private String accidentName;

    private Long accidentDepartmentId;

    private Date occurrenceTime;

    private String occurrencePlace;

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

    private Long accidentExpressId;

    private Boolean status ;

    private String accidentType;

@@ -27,14 +42,6 @@

    public void setId(Long id) {
        this.id = id;
    }

    public Boolean getStatus() {
        return status;
    }

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

    public Long getAccidentExpressId() {
@@ -71,4 +78,35 @@
        this.accidentGrade = accidentGrade;
    }

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