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/enums/ApproveStatus.java

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

public enum ApproveStatus {

    // 应急预案
    // 审批中应急预案业务类型为1
    EMERGENCY(1);

    private Integer status;