From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java | 8 ++++----
1 files changed, 4 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..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
@@ -49,14 +49,14 @@
@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")
private LocalDate applicationDate;
--
Gitblit v1.7.1