From 03587b58b343956f910a653c37b9a7bcd84e4af9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 18:54:03 +0800
Subject: [PATCH] 资产管理-资产领用列表 阿里云OSS文件上传

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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..dd7282c 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
@@ -31,7 +31,7 @@
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     @ApiModelProperty(value = "申请单号")
     @TableField("application_code")
@@ -49,13 +49,13 @@
     @TableField("applicant_name")
     private String applicantName;
 
-    @ApiModelProperty(value = "部门ID")
-    @TableField("dept_id")
-    private Integer deptId;
-
     @ApiModelProperty(value = "所属部门")
     @TableField("dept_name")
     private String deptName;
+
+    @ApiModelProperty(value = "部门ID")
+    @TableField("dept_id")
+    private Integer deptId;
 
     @ApiModelProperty(value = "申请日期")
     @TableField("application_date")
@@ -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