From 2bdcf12109e62a731eb16e90b6e1c39a67853fb1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 13 十月 2025 18:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 4e3b3a3..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;
@@ -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")
@@ -95,6 +96,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Integer disabled;
--
Gitblit v1.7.1