From f409bb23163dfa6c3f0508f6b90a1caacc7b9518 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 16 九月 2025 18:17:31 +0800
Subject: [PATCH] Merge branch 'feature_asset'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..47c552e 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")
@@ -58,7 +58,7 @@
@ApiModelProperty(value = "启用状态 0-禁用 1-启用")
@TableField("status")
- private Boolean status;
+ private Integer status;
@ApiModelProperty(value = "是否需要签名 0-否，1-是")
@TableField("sign_flag")
@@ -84,5 +84,7 @@
@TableField("disabled")
private Boolean disabled;
-
+ @ApiModelProperty(value = "审批人名称")
+ @TableField(exist = false)
+ private String approvalName;
}
--
Gitblit v1.7.1