From 720e3c0e119ca062dc69aca47ec6c42254fee75d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 21:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TLeaveAudit.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TLeaveAudit.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TLeaveAudit.java
index d35777d..0ddcbdd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TLeaveAudit.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TLeaveAudit.java
@@ -38,7 +38,7 @@
@TableField("audit_status")
private Integer auditStatus;
- @ApiModelProperty(value = "审批人id或抄送人id,抄送人id逗号拼接")
+ @ApiModelProperty(value = "抄送人id和审批人id，逗号拼接")
@TableField("audit_id")
private String auditId;
@@ -47,7 +47,7 @@
private Integer auditType;
@ApiModelProperty(value = "审批时间/抄送时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("audit_time")
private LocalDateTime auditTime;
--
Gitblit v1.7.1