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/OaApprovalTodo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 4cf52c2..05f04aa 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
@@ -30,11 +30,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")

--
Gitblit v1.7.1