Commit 40b08268 by huangfusuper

【解决冲突】

parent c68c3d0e
/*
package com.byit.enums; package com.byit.enums;
*/
/** /**
* @description: 工作流属性的枚举类 * @description: 工作流属性的枚举类
* @author: gml * @author: gml
* @create: 2019-12-26 15:17 * @date: 2019-12-26 15:17
*//* * */
public enum FlowPropertyEnum { public enum FlowPropertyEnum {
...@@ -23,7 +22,7 @@ public enum FlowPropertyEnum { ...@@ -23,7 +22,7 @@ public enum FlowPropertyEnum {
private String code; private String code;
private String name; private String name;
private FlowPropertyEnum(String code, String name){ FlowPropertyEnum(String code, String name){
this.code = code; this.code = code;
this.name = name; this.name = name;
} }
...@@ -37,4 +36,3 @@ public enum FlowPropertyEnum { ...@@ -37,4 +36,3 @@ public enum FlowPropertyEnum {
} }
} }
*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment