【解决冲突】

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
- *//*
+ * @date: 2019-12-26 15:17
+ * */
+
 
 public enum FlowPropertyEnum {
 
@@ -23,7 +22,7 @@ public enum FlowPropertyEnum {
     private String code;
     private String name;
 
-    private FlowPropertyEnum(String code, String name){
+    FlowPropertyEnum(String code, String name){
         this.code = code;
         this.name = name;
     }
@@ -37,4 +36,3 @@ public enum FlowPropertyEnum {
     }
 
 }
-*/