diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java index 0878d1e45..bf05f740f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java @@ -73,12 +73,12 @@ public class FlowDefinitionVo implements Serializable { private Integer isPublish; /** - * 审批表单是否自定义(Y是 2否) + * 审批表单是否自定义(Y是 N否) */ private String formCustom; /** - * 审批表单是否自定义(Y是 2否) + * 审批表单路径 */ private String formPath; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java index 59fb8cb9f..8acb9b44e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java @@ -162,7 +162,7 @@ public class FlowHisTaskVo implements Serializable { /** - * 审批表单是否自定义(Y是 2否) + * 审批表单是否自定义(Y是 N否) */ private String formCustom; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java index d6c476dd2..d85c78e19 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java @@ -97,12 +97,12 @@ public class FlowInstanceVo { private String createBy; /** - * 审批表单是否自定义(Y是 2否) + * 审批表单是否自定义(Y是 N否) */ private String formCustom; /** - * 审批表单是否自定义(Y是 2否) + * 审批表单路径 */ private String formPath; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index e56d4d1e5..a5ee9c49c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -90,7 +90,7 @@ public class FlowTaskVo implements Serializable { private List userList; /** - * 审批表单是否自定义(Y是 2否) + * 审批表单是否自定义(Y是 N否) */ private String formCustom; diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index c5425585d..5a33f37fa 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -173,7 +173,7 @@ INSERT INTO flow_category values (103, '000000', 101, '0,100,101', '请假', 0, INSERT INTO flow_category values (104, '000000', 101, '0,100,101', '出差', 1, '0', 103, 1, sysdate(), null, null); INSERT INTO flow_category values (105, '000000', 101, '0,100,101', '加班', 2, '0', 103, 1, sysdate(), null, null); INSERT INTO flow_category values (106, '000000', 101, '0,100,101', '换班', 3, '0', 103, 1, sysdate(), null, null); -INSERT INTO flow_category values (107, '000000', 101, '0,100,101', '外出', 3, '0', 103, 1, sysdate(), null, null); +INSERT INTO flow_category values (107, '000000', 101, '0,100,101', '外出', 4, '0', 103, 1, sysdate(), null, null); INSERT INTO flow_category values (108, '000000', 102, '0,100,102', '转正', 1, '0', 103, 1, sysdate(), null, null); INSERT INTO flow_category values (109, '000000', 102, '0,100,102', '离职', 2, '0', 103, 1, sysdate(), null, null);