From 71eed1baf6de1de2545f88482839d9051ac86f5a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 14:50:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 65aacf2..087713f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -26,7 +26,7 @@
private static final long serialVersionUID = 1L;
/** 涓婚敭id */
- private String id;
+ private Long id;
/** 涓昏鍒掑憳 */
@Excel(name = "涓昏鍒�")
@@ -190,9 +190,9 @@
private Date orderCreateTime;
/** 鑷畾涔夋椂闂� */
- @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;
/** 鐢熶骇鍩哄湴 */
@Excel(name = "鐢熶骇鍩哄湴")
--
Gitblit v1.9.3