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

songhuangfeng123

2022-09-16 357935fb2785dc79f4f47ffa7e1c503bc8cea376

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

@@ -40,7 +40,7 @@

    private Boolean casualties;

    private String accidentCause;
    private Byte accidentCause;

    private Date occurrenceTime;

@@ -130,11 +130,11 @@
        this.casualties = casualties;
    }

    public String getAccidentCause() {
    public Byte getAccidentCause() {
        return accidentCause;
    }

    public void setAccidentCause(String accidentCause) {
    public void setAccidentCause(Byte accidentCause) {
        this.accidentCause = accidentCause;
    }