Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java

@@ -2,6 +2,7 @@

public class EmergencyPlanQuery {

    //废止状态 0：未废止 1：已废止
    private Boolean abolishStatus;

    public Boolean getAbolishStatus() {
@@ -12,8 +13,9 @@
        this.abolishStatus = abolishStatus;
    }

    //预案名称
    private String name ;

    //预案类型
    private Byte type ;

    public String getName() {