From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 19 九月 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationDetailRespDTO.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/resp/WorkInjuryDeclarationDetailRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationDetailRespDTO.java
index 1473405..32efbd8 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationDetailRespDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationDetailRespDTO.java
@@ -11,6 +11,7 @@
private String accidentName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date occurrenceTime;
public String getAccidentName() {
@@ -39,7 +40,7 @@
private Long accidentExpressId;
- private String workInjuryType;
+ private Byte workInjuryType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date declareDate;
@@ -98,11 +99,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