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

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

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

@@ -2,9 +2,8 @@

public enum ApproveStatus {

    NOT_APPROVE(1),
    UNDER_APPROVE(2),
    COMPLETED_APPROVE(3);
    // 审批中应急预案业务类型为1
    EMERGENCY(1);

    private Integer status;