Merge remote-tracking branch 'origin/master' into master

songhuangfeng123

2022-08-12 5ed84eaec030109b0e6b77ae2667ed56e959871b

 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() {