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 4e442ea..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
@@ -58,7 +58,7 @@
@ApiModelProperty(value = "启用状态 0-禁用 1-启用")
@TableField("status")
- private Integer status;
+ private Boolean 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