From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 efcb4ef..e9ac6ee 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -50,7 +51,7 @@
@ApiModelProperty(value = "审批类型 0-上级部门,1-指定部门审批，2-指定人员审批")
@TableField("approval_type")
- private Boolean approvalType;
+ private Integer approvalType;
@ApiModelProperty(value = "审批类型上级部门为时为空，指定部门审批存部门id，指定人员审批存人员id，多个id使用英文逗号拼接")
@TableField("approval_ids")
@@ -82,6 +83,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Boolean disabled;
@ApiModelProperty(value = "审批人名称")
--
Gitblit v1.7.1