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/OaApprovalApplications.java | 16 +++++++++-------
1 files changed, 9 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..ca30f30 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
@@ -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;
@@ -31,7 +32,7 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "申请单号")
@TableField("application_code")
@@ -49,13 +50,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 +68,7 @@
@ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
@TableField("approval_status")
- private Boolean approvalStatus;
+ private Integer approvalStatus;
@ApiModelProperty(value = "附件地址，多个使用英文逗号拼接")
@TableField("attachment_url")
@@ -95,7 +96,8 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
- private Boolean disabled;
+ @TableLogic
+ private Integer disabled;
}
--
Gitblit v1.7.1