From b84fc1807a6ce71f4d10cdb10da186abc5dcc173 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 19:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 f120640..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
@@ -48,14 +48,14 @@
@ApiModelProperty(value = "申请人")
@TableField("applicant_name")
private String applicantName;
+
@ApiModelProperty(value = "所属部门")
@TableField("dept_name")
private String deptName;
+
@ApiModelProperty(value = "部门ID")
@TableField("dept_id")
private Integer deptId;
-
-
@ApiModelProperty(value = "申请日期")
@TableField("application_date")
--
Gitblit v1.7.1