From 43b3006894adb07e968ba4d23b2542b791d2b5bf Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 29 四月 2025 14:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
index 93de2ee..5394aae 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
@@ -49,13 +49,13 @@
private BigDecimal standardTime;
/** 宸ュ簭璁″垝寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "宸ュ簭璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+ @Excel(name = "宸ュ簭璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
private Date palnStartDate;
/** 宸ュ簭璁″垝瀹屾垚鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "宸ュ簭璁″垝瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+ @Excel(name = "宸ュ簭璁″垝瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
private Date planCompleteDate;
/** 鍔犲伐鏁伴噺-灏忔暟 */
--
Gitblit v1.9.3