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/resp/AccidentExpressPageRespDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressPageRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressPageRespDTO.java
index 3a90c70..9d127fd 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressPageRespDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentExpressPageRespDTO.java
@@ -36,7 +36,7 @@
private Long createUid;
- private String accidentCause;
+ private Byte accidentCause;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date occurrenceTime;
@@ -72,11 +72,11 @@
}
- public String getAccidentCause() {
+ public Byte getAccidentCause() {
return accidentCause;
}
- public void setAccidentCause(String accidentCause) {
+ public void setAccidentCause(Byte accidentCause) {
this.accidentCause = accidentCause;
}
--
Gitblit v1.9.2