From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalTodo.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalTodo.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalTodo.java
index 13b1219..98c2390 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalTodo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalTodo.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;
@@ -30,11 +31,11 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "申请ID")
@TableField("application_id")
- private Long applicationId;
+ private Integer applicationId;
@ApiModelProperty(value = "申请单号")
@TableField("application_code")
@@ -62,7 +63,7 @@
@ApiModelProperty(value = "状态 0-待处理，1-已处理")
@TableField("status")
- private Boolean status;
+ private Integer status;
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
@@ -72,5 +73,9 @@
@TableField("handle_time")
private LocalDateTime handleTime;
+ @ApiModelProperty(value = "是否删除 0-否，1-是")
+ @TableField("disabled")
+ @TableLogic
+ private Integer disabled;
}
--
Gitblit v1.7.1