Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-16 a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java

@@ -7,12 +7,7 @@
public enum  EventTasksStatusEnum {

    DZF(1,"待走访"),
    JXZ(2,"进行中"),
    ZJJJ(3,"正常"),
    DYZ(4,"待验证"),
    CG(5,"草稿"),
    YCX(6,"已撤销"),
    YC(7,"异常"),
    YJJ(2,"已走访")
    ;


@@ -38,6 +33,6 @@
                return item.getName();
            }
        }
        return YC.getName();
        return "";
    }
}