From c357f8844e03627d0c3bea4bf2058e7c69ff3518 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 14:18:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java
index 65e69dd..a803376 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java
@@ -61,8 +61,8 @@
private BigDecimal processTotalTime;
/** 璁″垝寮�宸ユ棩 */
- @Excel(name = "璁″垝寮�宸ユ棩")
- @Schema(description = "璁″垝寮�宸ユ棩", type = "Date")
+ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date processPlanStartDay;
/** 璁捐宸ユ椂 */
@@ -123,6 +123,9 @@
@Excel(name = "鎵规鍙�")
private String batchNumber;
+ /** 宸ュ巶 */
+ private String plant;
+
@Transient
private String searchStartDate;
--
Gitblit v1.9.3