From 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 25 八月 2023 17:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
index 99942be..e52e26e 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
@@ -79,6 +79,7 @@
@Excel(name = "寮圭獥鏍囪")
private String viewFlag;
/** 鎵撳崱鏃堕棿*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎵撳崱鏃堕棿")
private Date clockInTime;
--
Gitblit v1.9.3