From e1e290cbef86b5a5c58b8ef238424373f00ed00b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 四月 2026 18:03:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index 659e4e4..13e29c5 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -144,7 +144,7 @@
*/
@Excel(name = "绉戝缂栫爜")
@ApiModelProperty("绉戝缂栫爜")
- private String deptCode;
+ private String deptcode;
/**
* 绉戝
@@ -326,6 +326,7 @@
private Integer continueFlag;
@ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date continueTimeNow;
@ApiModelProperty(value = "缁х画鍐呭")
@@ -335,5 +336,6 @@
private Integer continueCount;
@ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date continueTimeNext;
}
--
Gitblit v1.9.3