【解决冲突】

byit-myth-core/myth-admin-core/src/main/java/com/byit/enums/FlowProperTyEnum.java

-package com.byit.enums;
-
-/**
- * @description: 工作流属性的枚举类
- * @author: gml
- * @create: 2019-12-26 15:17
- */
-public enum FlowProperTyEnum {
-
-    HAVE_DEPEND("0", "有下游依赖"),
-    NO_HAVE_DEPEND("1", "没有下游依赖"),
-    IS_INNER("0", "是内嵌工作流"),
-    ISNOT_INNER("1", "不是内嵌工作流"),
-    IS_TOP("0", "是顶级工作流"),
-    ISNOT_TOP("1", "不是顶级工作流")
-    ;
-
-    private String code;
-    private String name;
-
-    private FlowProperTyEnum(String code, String name){
-        this.code = code;
-        this.name = name;
-    }
-
-    public String getCode(){
-        return this.code;
-    }
-
-    public String getName(){
-        return this.name;
-    }
-
-}