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

zhangfeng

2022-12-23 5bd5f3bcd6d2cb375feb0756505691b551339716

 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;