From bdd967acce69d2420d9866789dfcee42c7e77023 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 9b46af2..f120640 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")
@@ -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("dept_name")
- private String deptName;
+
@ApiModelProperty(value = "申请日期")
@TableField("application_date")
--
Gitblit v1.7.1