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 | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 8ca5183..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
@@ -75,11 +75,22 @@
/** 鏌ョ湅浣嶇疆 */
@Excel(name = "鏌ョ湅浣嶇疆")
private String viewPosition;
-
+ /** 寮圭獥鏍囪 */
+ @Excel(name = "寮圭獥鏍囪")
+ private String viewFlag;
/** 鎵撳崱鏃堕棿*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎵撳崱鏃堕棿")
private Date clockInTime;
+ public String getViewFlag() {
+ return viewFlag;
+ }
+
+ public void setViewFlag(String viewFlag) {
+ this.viewFlag = viewFlag;
+ }
+
public Date getClockInTime() {
return clockInTime;
}
--
Gitblit v1.9.3