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

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
index 3e75870..4fb3ac0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -9,6 +9,26 @@
 @TableName("emergency_plan")
 public class EmergencyPlanInfo {
 
+    private Boolean abolishStatus;
+
+    public Boolean getAbolishStatus() {
+        return abolishStatus;
+    }
+
+    public void setAbolishStatus(Boolean abolishStatus) {
+        this.abolishStatus = abolishStatus;
+    }
+
+    private String authorName;
+
+    public String getAuthorName() {
+        return authorName;
+    }
+
+    public void setAuthorName(String authorName) {
+        this.authorName = authorName;
+    }
+
     @TableId(type = IdType.AUTO)
     private Long id;
 
@@ -22,7 +42,7 @@
 
     private Long updateUid;
 
-    private Byte statue;
+    private Integer status;
 
     private Date releaseDate;
 
@@ -30,11 +50,11 @@
 
     private Long authorDeptId;
 
-    private Byte associatedDanger;
+    private Boolean associatedDanger;
 
-    private String type;
+    private Byte type;
 
-    private String level;
+    private Byte level;
 
     private String name ;
 
@@ -86,12 +106,12 @@
         this.updateUid = updateUid;
     }
 
-    public Byte getStatue() {
-        return statue;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setStatue(Byte statue) {
-        this.statue = statue;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
     public Date getReleaseDate() {
@@ -118,27 +138,27 @@
         this.authorDeptId = authorDeptId;
     }
 
-    public Byte getAssociatedDanger() {
+    public Boolean getAssociatedDanger() {
         return associatedDanger;
     }
 
-    public void setAssociatedDanger(Byte associatedDanger) {
+    public void setAssociatedDanger(Boolean associatedDanger) {
         this.associatedDanger = associatedDanger;
     }
 
-    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;
     }
 
@@ -159,7 +179,7 @@
                 ", gmtModitify=" + gmtModitify +
                 ", createUid='" + createUid + '\'' +
                 ", updateUid='" + updateUid + '\'' +
-                ", statue=" + statue +
+                ", status=" + status +
                 ", releaseDate=" + releaseDate +
                 ", authorUid='" + authorUid + '\'' +
                 ", authorDeptId=" + authorDeptId +

--
Gitblit v1.9.2