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

songhuangfeng123

2022-08-22 652fca264c2468782a2d5a4fbe21a13df448b91a

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanStatus.java

@@ -3,9 +3,8 @@
public enum EmergencyPlanStatus {

    START(1,"开始"),
    FIRST_LEVEL_APPROEAL(2,"一级审批"),
    SECOND_LEVEL_APPROEAL(3,"二级审批"),
    END(4,"结束");
    SECOND_LEVEL_APPROVAL(2,"审批中"),
    END(3,"结束");

    private Integer status;