From 2aa0dd9c34c6be86e70b1d2d939d3660552cb514 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 九月 2025 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java
index 779d67d..414940e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java
@@ -50,7 +50,7 @@
@ApiModelProperty(value = "审批类型 0-上级部门,1-指定部门审批，2-指定人员审批")
@TableField("approval_type")
- private Boolean approvalType;
+ private Integer approvalType;
@ApiModelProperty(value = "审批类型上级部门为时为空，指定部门审批存部门id，指定人员审批存人员id，多个id使用英文逗号拼接")
@TableField("approval_ids")
@@ -84,5 +84,7 @@
@TableField("disabled")
private Boolean disabled;
-
+ @ApiModelProperty(value = "审批人名称")
+ @TableField(exist = false)
+ private String approvalName;
}
--
Gitblit v1.7.1