From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
index c19ae34..e43b215 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
@@ -30,7 +30,7 @@
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private Long requireTraceId;
+ private Long requireTrackId;
/** 宸ュ崟鍙� */
@Excel(name = "宸ュ崟鍙�")
@@ -94,10 +94,15 @@
/** 闇�姹傝鍒掑紑宸ユ棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闇�姹傝鍒掑紑宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date startDay;
+ private Date startDate;
/** 闇�姹傝鍒掑紑瀹屾棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闇�姹傝鍒掑紑瀹屾棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date completeDay;
+ private Date completeDate;
+
+ /** 鑷畾涔夋棩鏈� */
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @Excel(name = "鑷畾涔夋棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+// private Date customTime;
}
--
Gitblit v1.9.3