Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java

@@ -9,6 +9,16 @@
@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() {