From c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1 Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期一, 12 五月 2025 17:36:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 8 +++++--- 1 files changed, 5 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 5bcac8f..a481f6d 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 @@ -102,7 +102,9 @@ 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; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @Excel(name = "鑷畾涔夋棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") +// private Date customTime; + + private Integer requireNum; } -- Gitblit v1.9.3