From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
index c8521d1..93ccde3 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
+++ b/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;
}
--
Gitblit v1.9.2