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/OaApprovalApplications.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java
index 80c258b..9b46af2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java
@@ -67,7 +67,7 @@
@ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
@TableField("approval_status")
- private Boolean approvalStatus;
+ private Integer approvalStatus;
@ApiModelProperty(value = "附件地址，多个使用英文逗号拼接")
@TableField("attachment_url")
@@ -95,7 +95,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
- private Boolean disabled;
+ private Integer disabled;
}
--
Gitblit v1.7.1