From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
index bb251ba..5aeda83 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -50,6 +50,7 @@
this.checkApprove = checkApprove;
}
+ //编写人名称
private String authorName;
public String getAuthorName() {
@@ -61,15 +62,15 @@
}
private Long id;
-
+ // 预案名称
private String name ;
-
+ //预案状态
private Integer status ;
-
- private String type;
-
- private String level;
-
+ //预案类型（数据字典）
+ private Byte type;
+ //预案级别（数据字典）
+ private Byte level;
+ //发布实施日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
@@ -98,19 +99,19 @@
this.status = status;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
--
Gitblit v1.9.2