From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
index 5908bd2..8ea0b85 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
@@ -1,5 +1,7 @@
 package com.aps.core.domain;
 
+import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -13,7 +15,7 @@
  * &#064;date  2025-05-08
  */
 @Data
-public class ApsPlateOrderPlanDate
+public class ApsPlateOrderPlanDate extends BaseEntity
 {
     @Serial
     private static final long serialVersionUID = 1L;
@@ -27,5 +29,6 @@
     private List<Long> planIds;
 
     /** 鑷畾涔夋棩鏈� */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp customDate;
 }

--
Gitblit v1.9.3