Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

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

@@ -18,8 +18,9 @@

    private Long accidentExpressId;

    private String workInjuryType;
    private Byte workInjuryType;

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

    private BigDecimal lostTime;
@@ -76,11 +77,11 @@
        this.accidentExpressId = accidentExpressId;
    }

    public String getWorkInjuryType() {
    public Byte getWorkInjuryType() {
        return workInjuryType;
    }

    public void setWorkInjuryType(String workInjuryType) {
    public void setWorkInjuryType(Byte workInjuryType) {
        this.workInjuryType = workInjuryType;
    }