From 2b72ee5736445aab3aa2b4ba6b862d7c660be9ce Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 13 五月 2025 09:56:48 +0800
Subject: [PATCH] Merge branch 'dev_mp' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
index f1b80b9..c15b17d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
@@ -24,6 +24,7 @@
private static final long serialVersionUID = 1L;
/** 闇�姹侷D */
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
/** 闇�姹傝拷婧疘D */
@@ -66,14 +67,17 @@
private BigDecimal netRequirement;
/** 璁″垝寮�宸ユ棩 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁″垝寮�宸ユ棩")
private Date startDate;
/** 璁″垝瀹屽伐鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁″垝瀹屽伐鏃�")
private Date completeDate;
/** 闇�姹傛棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闇�姹傛棩鏈�")
private Date demandDate;
@@ -101,6 +105,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "寤鸿瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date suggestedCompletionDate;
+
/** 寤惰繜椋庨櫓鏍囪瘑 */
private String hasDelayRisk;
--
Gitblit v1.9.3