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

songhuangfeng123

2022-09-02 fabd08d87d00bfdf1aacf473fd905fdd3c903ed3

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

@@ -20,6 +20,7 @@

    private String workInjuryType;

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

    private BigDecimal lostTime;