From 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 12 五月 2025 18:29:37 +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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 e0eb84d..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 = "涓昏鍒�")
@@ -189,6 +189,11 @@
@Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
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;
+
/** 鐢熶骇鍩哄湴 */
@Excel(name = "鐢熶骇鍩哄湴")
private String productionBase;
--
Gitblit v1.9.3